diff --git a/.gitignore b/.gitignore
index 6b1868c..2b7364c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,8 +31,11 @@ Thumbs.db
 .idea/
 
 # ── Migrations ─────────────────────────────────────────────────────────
-# New EF Core migrations are not committed. Note the 4 migrations already in
-# Backend/ERPCore/Infra/Persistence/Migrations/ stay tracked — .gitignore does
-# not apply to tracked files — so edits to those still get committed as normal.
-# Untracking them too takes `git rm --cached`.
-**/Migrations/
+# Reverted 2026-07-31: excluding new EF Core migrations while
+# ErpDbContextModelSnapshot.cs stayed tracked meant every `dotnet ef
+# migrations add` after the initial 4 silently produced a migration git would
+# never see, while the (tracked) snapshot's changes committed normally —
+# so the snapshot kept claiming tables existed that no migration in git
+# history ever created them. Confirmed live: 25 HRM tables + 11 Manufacturing
+# tables were missing from the actual database for exactly this reason.
+# Migrations now stay tracked like any other source file — commit them.
diff --git a/Backend/ERPCore/Controllers/BundleSalesController.cs b/Backend/ERPCore/Controllers/BundleSalesController.cs
new file mode 100644
index 0000000..6b45382
--- /dev/null
+++ b/Backend/ERPCore/Controllers/BundleSalesController.cs
@@ -0,0 +1,79 @@
+using ERPCore.Domain.Enums;
+using ERPCore.Dtos.Common;
+using ERPCore.Dtos.Sales;
+using ERPCore.Services.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+
+namespace ERPCore.Controllers;
+
+[Route("api/v1/bundle-sales")]
+public sealed class BundleSalesController : ApiControllerBase
+{
+    private readonly IBundleSaleService _bundles;
+
+    public BundleSalesController(IBundleSaleService bundles) => _bundles = bundles;
+
+    [HttpGet("templates")]
+    [ProducesResponseType(typeof(PagedResponse<BundleSaleTemplateSummaryDto>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<PagedResponse<BundleSaleTemplateSummaryDto>>> ListTemplates(
+        [FromQuery] PageQuery query,
+        CancellationToken ct)
+        => Ok(await _bundles.ListTemplatesAsync(query, ct));
+
+    [HttpGet("templates/{bundleSaleTemplateId:int}")]
+    [ProducesResponseType(typeof(BundleSaleTemplateDto), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public async Task<ActionResult<BundleSaleTemplateDto>> GetTemplate(int bundleSaleTemplateId, CancellationToken ct)
+    {
+        var result = await _bundles.GetTemplateAsync(bundleSaleTemplateId, ct);
+        return result is null ? NotFound() : Ok(result);
+    }
+
+    [HttpGet]
+    [ProducesResponseType(typeof(PagedResponse<BundleSaleSummaryDto>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<PagedResponse<BundleSaleSummaryDto>>> List(
+        [FromQuery] PageQuery query,
+        [FromQuery] int? customerId,
+        [FromQuery] int? warehouseId,
+        CancellationToken ct)
+        => Ok(await _bundles.ListAsync(query, customerId, warehouseId, ct));
+
+    [HttpGet("{bundleSaleId:int}")]
+    [ProducesResponseType(typeof(BundleSaleDto), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public async Task<ActionResult<BundleSaleDto>> GetById(int bundleSaleId, CancellationToken ct)
+    {
+        var result = await _bundles.GetAsync(bundleSaleId, ct);
+        return result is null ? NotFound() : Ok(result);
+    }
+
+    [HttpGet("{bundleSaleId:int}/posting-check")]
+    [ProducesResponseType(typeof(BundleSalePostingCheckDto), StatusCodes.Status200OK)]
+    public async Task<ActionResult<BundleSalePostingCheckDto>> PostingCheck(int bundleSaleId, CancellationToken ct)
+        => Ok(await _bundles.CheckPostingAsync(bundleSaleId, ct));
+
+    [HttpPost]
+    [ProducesResponseType(typeof(BundleSaleDto), StatusCodes.Status201Created)]
+    public async Task<ActionResult<BundleSaleDto>> Create([FromBody] CreateBundleSaleRequest request, CancellationToken ct)
+    {
+        var result = await _bundles.CreateAsync(request, ct);
+        return Created($"/api/v1/bundle-sales/{result.BundleSaleId}", result);
+    }
+
+    [HttpPut("{bundleSaleId:int}")]
+    [ProducesResponseType(typeof(BundleSaleDto), StatusCodes.Status200OK)]
+    public async Task<ActionResult<BundleSaleDto>> Update(int bundleSaleId, [FromBody] UpdateBundleSaleRequest request, CancellationToken ct)
+    {
+        return Ok(await _bundles.UpdateAsync(bundleSaleId, request, ct));
+    }
+
+    [HttpPost("{bundleSaleId:int}/post")]
+    [ProducesResponseType(typeof(BundleSaleDto), StatusCodes.Status200OK)]
+    public async Task<ActionResult<BundleSaleDto>> Post(int bundleSaleId, CancellationToken ct)
+        => Ok(await _bundles.PostAsync(bundleSaleId, ct));
+
+    [HttpPost("{bundleSaleId:int}/cancel")]
+    [ProducesResponseType(typeof(BundleSaleDto), StatusCodes.Status200OK)]
+    public async Task<ActionResult<BundleSaleDto>> Cancel(int bundleSaleId, CancellationToken ct)
+        => Ok(await _bundles.CancelAsync(bundleSaleId, ct));
+}
diff --git a/Backend/ERPCore/Controllers/CustomersController.cs b/Backend/ERPCore/Controllers/CustomersController.cs
new file mode 100644
index 0000000..ff7cda4
--- /dev/null
+++ b/Backend/ERPCore/Controllers/CustomersController.cs
@@ -0,0 +1,69 @@
+using ERPCore.Domain.Enums;
+using ERPCore.Dtos.Common;
+using ERPCore.Dtos.Customers;
+using ERPCore.Services.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+
+namespace ERPCore.Controllers;
+
+/// <summary>Customer master endpoints for Phase 1 sales.</summary>
+[Route("api/v1/customers")]
+public sealed class CustomersController : ApiControllerBase
+{
+    private readonly ICustomerService _customers;
+
+    public CustomersController(ICustomerService customers) => _customers = customers;
+
+    [HttpGet]
+    [ProducesResponseType(typeof(PagedResponse<CustomerDto>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<PagedResponse<CustomerDto>>> List(
+        [FromQuery] PageQuery query,
+        [FromQuery] EntityStatus? status,
+        [FromQuery] CustomerType? customerType,
+        CancellationToken ct)
+        => Ok(await _customers.ListAsync(query, status, customerType, ct));
+
+    [HttpGet("{customerId:int}")]
+    [ProducesResponseType(typeof(CustomerDto), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public async Task<ActionResult<CustomerDto>> GetById(int customerId, CancellationToken ct)
+    {
+        var result = await _customers.GetAsync(customerId, ct);
+        if (result is null) return NotFound();
+
+        SetETag(result.RowVersion);
+        return Ok(result.Value);
+    }
+
+    [HttpPost]
+    [ProducesResponseType(typeof(CustomerDto), StatusCodes.Status201Created)]
+    [ProducesResponseType(StatusCodes.Status409Conflict)]
+    public async Task<ActionResult<CustomerDto>> Create([FromBody] CreateCustomerRequest request, CancellationToken ct)
+    {
+        var result = await _customers.CreateAsync(request, ct);
+        SetETag(result.RowVersion);
+        return Created($"/api/v1/customers/{result.Value.CustomerId}", result.Value);
+    }
+
+    [HttpPut("{customerId:int}")]
+    [ProducesResponseType(typeof(CustomerDto), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    [ProducesResponseType(StatusCodes.Status409Conflict)]
+    [ProducesResponseType(StatusCodes.Status412PreconditionFailed)]
+    public async Task<ActionResult<CustomerDto>> Update(int customerId, [FromBody] UpdateCustomerRequest request, CancellationToken ct)
+    {
+        var expected = RequireIfMatch();
+        var result = await _customers.UpdateAsync(customerId, request, expected, ct);
+        SetETag(result.RowVersion);
+        return Ok(result.Value);
+    }
+
+    [HttpPatch("{customerId:int}/status")]
+    [ProducesResponseType(StatusCodes.Status204NoContent)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public async Task<IActionResult> SetStatus(int customerId, [FromBody] UpdateCustomerStatusRequest request, CancellationToken ct)
+    {
+        await _customers.SetStatusAsync(customerId, request.Status, ct);
+        return NoContent();
+    }
+}
diff --git a/Backend/ERPCore/Controllers/FreeIssuesController.cs b/Backend/ERPCore/Controllers/FreeIssuesController.cs
new file mode 100644
index 0000000..93057e8
--- /dev/null
+++ b/Backend/ERPCore/Controllers/FreeIssuesController.cs
@@ -0,0 +1,78 @@
+using ERPCore.Domain.Enums;
+using ERPCore.Dtos.Common;
+using ERPCore.Dtos.Sales;
+using ERPCore.Services.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+
+namespace ERPCore.Controllers;
+
+/// <summary>
+/// Thin API alias for free-issue handling. Free issues are modeled as sales slips
+/// with line-level <c>IsFreeIssue</c>/<c>FreeQty</c> flags, so this controller reuses
+/// the existing sales-slip CRUD surface under a more business-friendly route.
+/// </summary>
+[Route("api/v1/free-issues")]
+public sealed class FreeIssuesController : ApiControllerBase
+{
+    private readonly ISalesSlipService _slips;
+
+    public FreeIssuesController(ISalesSlipService slips) => _slips = slips;
+
+    [HttpGet]
+    [ProducesResponseType(typeof(PagedResponse<FreeIssueSummaryDto>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<PagedResponse<FreeIssueSummaryDto>>> List(
+        [FromQuery] PageQuery query,
+        [FromQuery] SalesSlipStatus? status,
+        [FromQuery] int? customerId,
+        [FromQuery] int? warehouseId,
+        CancellationToken ct)
+        => Ok(await _slips.ListFreeIssuesAsync(query, status, customerId, warehouseId, ct));
+
+    [HttpGet("{freeIssueId:int}")]
+    [ProducesResponseType(typeof(FreeIssueDto), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public async Task<ActionResult<FreeIssueDto>> GetById(int freeIssueId, CancellationToken ct)
+    {
+        var result = await _slips.GetFreeIssueAsync(freeIssueId, ct);
+        if (result is null) return NotFound();
+        SetETag(result.RowVersion);
+        return Ok(result.Value);
+    }
+
+    [HttpGet("{freeIssueId:int}/posting-check")]
+    [ProducesResponseType(typeof(SalesSlipPostingCheckDto), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public async Task<ActionResult<SalesSlipPostingCheckDto>> PostingCheck(int freeIssueId, CancellationToken ct)
+        => Ok(await _slips.CheckPostingAsync(freeIssueId, ct));
+
+    [HttpPost]
+    [ProducesResponseType(typeof(FreeIssueDto), StatusCodes.Status201Created)]
+    public async Task<ActionResult<FreeIssueDto>> Create([FromBody] CreateSalesSlipRequest request, CancellationToken ct)
+    {
+        var result = await _slips.CreateAsync(request, ct);
+        SetETag(result.RowVersion);
+        return Created($"/api/v1/free-issues/{result.Value.SalesSlipId}", result.Value);
+    }
+
+    [HttpPut("{freeIssueId:int}")]
+    [ProducesResponseType(typeof(FreeIssueDto), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    [ProducesResponseType(StatusCodes.Status412PreconditionFailed)]
+    public async Task<ActionResult<FreeIssueDto>> Update(int freeIssueId, [FromBody] UpdateSalesSlipRequest request, CancellationToken ct)
+    {
+        var expected = RequireIfMatch();
+        var result = await _slips.UpdateAsync(freeIssueId, request, expected, ct);
+        SetETag(result.RowVersion);
+        return Ok(result.Value);
+    }
+
+    [HttpPost("{freeIssueId:int}/post")]
+    [ProducesResponseType(typeof(FreeIssueDto), StatusCodes.Status200OK)]
+    public async Task<ActionResult<FreeIssueDto>> Post(int freeIssueId, CancellationToken ct)
+        => Ok(await _slips.PostAsync(freeIssueId, ct));
+
+    [HttpPost("{freeIssueId:int}/cancel")]
+    [ProducesResponseType(typeof(FreeIssueDto), StatusCodes.Status200OK)]
+    public async Task<ActionResult<FreeIssueDto>> Cancel(int freeIssueId, CancellationToken ct)
+        => Ok(await _slips.CancelAsync(freeIssueId, ct));
+}
diff --git a/Backend/ERPCore/Controllers/GeneralLedgerController.cs b/Backend/ERPCore/Controllers/GeneralLedgerController.cs
new file mode 100644
index 0000000..2f0bf12
--- /dev/null
+++ b/Backend/ERPCore/Controllers/GeneralLedgerController.cs
@@ -0,0 +1,43 @@
+using ERPCore.Services.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+
+namespace ERPCore.Controllers;
+
+/// <summary>
+/// Generic reverse proxy into the external General Ledger service — forwards every
+/// method/path/query/body under this prefix verbatim via
+/// <see cref="IGeneralLedgerService"/> and returns GL's response (status, content-type,
+/// body) unchanged. No endpoint-specific shape lives here; see
+/// docs/12-GENERAL-LEDGER-INTEGRATION.md for the full GL contract and what this proxy
+/// does and doesn't do. Gated by the same ERP door policy as every other v1 endpoint
+/// (<see cref="ApiControllerBase"/>) — the shared GL API key is attached server-side
+/// only and is never exposed to the frontend.
+/// </summary>
+[Route("api/v1/gl")]
+public sealed class GeneralLedgerController : ApiControllerBase
+{
+    private readonly IGeneralLedgerService _gl;
+
+    public GeneralLedgerController(IGeneralLedgerService gl) => _gl = gl;
+
+    [HttpGet("{**path}")]
+    public Task<IActionResult> Get(string path, CancellationToken ct) => ForwardAsync(HttpMethod.Get, path, ct);
+
+    [HttpPost("{**path}")]
+    public Task<IActionResult> Post(string path, CancellationToken ct) => ForwardAsync(HttpMethod.Post, path, ct);
+
+    [HttpPut("{**path}")]
+    public Task<IActionResult> Put(string path, CancellationToken ct) => ForwardAsync(HttpMethod.Put, path, ct);
+
+    private async Task<IActionResult> ForwardAsync(HttpMethod method, string path, CancellationToken ct)
+    {
+        var body = method == HttpMethod.Get ? null : Request.Body;
+        var result = await _gl.ForwardAsync(method, path, Request.QueryString.Value, Request.ContentType, body, ct);
+        return new ContentResult
+        {
+            StatusCode = result.StatusCode,
+            Content = result.Body,
+            ContentType = result.ContentType ?? "application/json"
+        };
+    }
+}
diff --git a/Backend/ERPCore/Controllers/SalesInvoicesController.cs b/Backend/ERPCore/Controllers/SalesInvoicesController.cs
new file mode 100644
index 0000000..29eab9e
--- /dev/null
+++ b/Backend/ERPCore/Controllers/SalesInvoicesController.cs
@@ -0,0 +1,73 @@
+using ERPCore.Domain.Enums;
+using ERPCore.Dtos.Common;
+using ERPCore.Dtos.Sales;
+using ERPCore.Services.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+
+namespace ERPCore.Controllers;
+
+[Route("api/v1/sales-invoices")]
+public sealed class SalesInvoicesController : ApiControllerBase
+{
+    private readonly ISalesInvoiceService _invoices;
+
+    public SalesInvoicesController(ISalesInvoiceService invoices) => _invoices = invoices;
+
+    [HttpGet]
+    [ProducesResponseType(typeof(PagedResponse<SalesInvoiceSummaryDto>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<PagedResponse<SalesInvoiceSummaryDto>>> List(
+        [FromQuery] PageQuery query,
+        [FromQuery] SalesInvoiceStatus? status,
+        [FromQuery] int? customerId,
+        [FromQuery] int? warehouseId,
+        CancellationToken ct)
+        => Ok(await _invoices.ListAsync(query, status, customerId, warehouseId, ct));
+
+    [HttpGet("{salesInvoiceId:int}")]
+    [ProducesResponseType(typeof(SalesInvoiceDto), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public async Task<ActionResult<SalesInvoiceDto>> GetById(int salesInvoiceId, CancellationToken ct)
+    {
+        var result = await _invoices.GetAsync(salesInvoiceId, ct);
+        if (result is null) return NotFound();
+        SetETag(result.RowVersion);
+        return Ok(result.Value);
+    }
+
+    [HttpGet("{salesInvoiceId:int}/posting-check")]
+    [ProducesResponseType(typeof(SalesInvoicePostingCheckDto), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public async Task<ActionResult<SalesInvoicePostingCheckDto>> PostingCheck(int salesInvoiceId, CancellationToken ct)
+        => Ok(await _invoices.CheckPostingAsync(salesInvoiceId, ct));
+
+    [HttpPost]
+    [ProducesResponseType(typeof(SalesInvoiceDto), StatusCodes.Status201Created)]
+    public async Task<ActionResult<SalesInvoiceDto>> Create([FromBody] CreateSalesInvoiceRequest request, CancellationToken ct)
+    {
+        var result = await _invoices.CreateAsync(request, ct);
+        SetETag(result.RowVersion);
+        return Created($"/api/v1/sales-invoices/{result.Value.SalesInvoiceId}", result.Value);
+    }
+
+    [HttpPut("{salesInvoiceId:int}")]
+    [ProducesResponseType(typeof(SalesInvoiceDto), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    [ProducesResponseType(StatusCodes.Status412PreconditionFailed)]
+    public async Task<ActionResult<SalesInvoiceDto>> Update(int salesInvoiceId, [FromBody] UpdateSalesInvoiceRequest request, CancellationToken ct)
+    {
+        var expected = RequireIfMatch();
+        var result = await _invoices.UpdateAsync(salesInvoiceId, request, expected, ct);
+        SetETag(result.RowVersion);
+        return Ok(result.Value);
+    }
+
+    [HttpPost("{salesInvoiceId:int}/post")]
+    [ProducesResponseType(typeof(SalesInvoiceDto), StatusCodes.Status200OK)]
+    public async Task<ActionResult<SalesInvoiceDto>> Post(int salesInvoiceId, CancellationToken ct)
+        => Ok(await _invoices.PostAsync(salesInvoiceId, ct));
+
+    [HttpPost("{salesInvoiceId:int}/cancel")]
+    [ProducesResponseType(typeof(SalesInvoiceDto), StatusCodes.Status200OK)]
+    public async Task<ActionResult<SalesInvoiceDto>> Cancel(int salesInvoiceId, CancellationToken ct)
+        => Ok(await _invoices.CancelAsync(salesInvoiceId, ct));
+}
diff --git a/Backend/ERPCore/Controllers/SalesReportsController.cs b/Backend/ERPCore/Controllers/SalesReportsController.cs
new file mode 100644
index 0000000..b6f18c7
--- /dev/null
+++ b/Backend/ERPCore/Controllers/SalesReportsController.cs
@@ -0,0 +1,35 @@
+using ERPCore.Dtos.Sales;
+using ERPCore.Services.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+
+namespace ERPCore.Controllers;
+
+[Route("api/v1/reports/sales")]
+public sealed class SalesReportsController : ApiControllerBase
+{
+    private readonly ISalesReportService _reports;
+
+    public SalesReportsController(ISalesReportService reports) => _reports = reports;
+
+    [HttpGet]
+    [ProducesResponseType(typeof(IReadOnlyList<SalesReportDefinitionDto>), StatusCodes.Status200OK)]
+    public ActionResult<IReadOnlyList<SalesReportDefinitionDto>> ListReports()
+        => Ok(_reports.ListReports());
+
+    [HttpGet("{reportId}")]
+    [ProducesResponseType(typeof(SalesReportDefinitionDto), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public ActionResult<SalesReportDefinitionDto> GetReport(string reportId)
+    {
+        var report = _reports.GetReport(reportId);
+        return report is null ? NotFound() : Ok(report);
+    }
+
+    [HttpPost("query")]
+    [ProducesResponseType(typeof(SalesReportQueryResponse), StatusCodes.Status200OK)]
+    public async Task<ActionResult<SalesReportQueryResponse>> Query([FromBody] SalesReportQueryRequest request, CancellationToken ct)
+    {
+        var rows = await _reports.QueryAsync(request.ReportType, request.From, request.To, request.ItemId, request.CustomerId, request.WarehouseId, ct);
+        return Ok(new SalesReportQueryResponse(request.ReportType, request.From, request.To, rows));
+    }
+}
diff --git a/Backend/ERPCore/Controllers/SalesSlipPromotionsController.cs b/Backend/ERPCore/Controllers/SalesSlipPromotionsController.cs
new file mode 100644
index 0000000..f5874dc
--- /dev/null
+++ b/Backend/ERPCore/Controllers/SalesSlipPromotionsController.cs
@@ -0,0 +1,22 @@
+using ERPCore.Dtos.Sales;
+using ERPCore.Services.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+
+namespace ERPCore.Controllers;
+
+[Route("api/v1/sales-slips/{salesSlipId:int}/free-issue-suggestions")]
+public sealed class SalesSlipPromotionsController : ApiControllerBase
+{
+    private readonly ISalesPromotionSuggestionService _suggestions;
+
+    public SalesSlipPromotionsController(ISalesPromotionSuggestionService suggestions) => _suggestions = suggestions;
+
+    [HttpGet]
+    [ProducesResponseType(typeof(SalesFreeIssueSuggestionDto), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public async Task<ActionResult<SalesFreeIssueSuggestionDto>> Get(int salesSlipId, CancellationToken ct)
+    {
+        var result = await _suggestions.GetFreeIssueSuggestionsAsync(salesSlipId, ct);
+        return result is null ? NotFound() : Ok(result);
+    }
+}
\ No newline at end of file
diff --git a/Backend/ERPCore/Controllers/SalesSlipsController.cs b/Backend/ERPCore/Controllers/SalesSlipsController.cs
new file mode 100644
index 0000000..a59f93e
--- /dev/null
+++ b/Backend/ERPCore/Controllers/SalesSlipsController.cs
@@ -0,0 +1,73 @@
+using ERPCore.Domain.Enums;
+using ERPCore.Dtos.Common;
+using ERPCore.Dtos.Sales;
+using ERPCore.Services.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+
+namespace ERPCore.Controllers;
+
+[Route("api/v1/sales-slips")]
+public sealed class SalesSlipsController : ApiControllerBase
+{
+    private readonly ISalesSlipService _slips;
+
+    public SalesSlipsController(ISalesSlipService slips) => _slips = slips;
+
+    [HttpGet]
+    [ProducesResponseType(typeof(PagedResponse<SalesSlipSummaryDto>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<PagedResponse<SalesSlipSummaryDto>>> List(
+        [FromQuery] PageQuery query,
+        [FromQuery] SalesSlipStatus? status,
+        [FromQuery] int? customerId,
+        [FromQuery] int? warehouseId,
+        CancellationToken ct)
+        => Ok(await _slips.ListAsync(query, status, customerId, warehouseId, ct));
+
+    [HttpGet("{salesSlipId:int}")]
+    [ProducesResponseType(typeof(SalesSlipDto), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public async Task<ActionResult<SalesSlipDto>> GetById(int salesSlipId, CancellationToken ct)
+    {
+        var result = await _slips.GetAsync(salesSlipId, ct);
+        if (result is null) return NotFound();
+        SetETag(result.RowVersion);
+        return Ok(result.Value);
+    }
+
+    [HttpGet("{salesSlipId:int}/posting-check")]
+    [ProducesResponseType(typeof(SalesSlipPostingCheckDto), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public async Task<ActionResult<SalesSlipPostingCheckDto>> PostingCheck(int salesSlipId, CancellationToken ct)
+        => Ok(await _slips.CheckPostingAsync(salesSlipId, ct));
+
+    [HttpPost]
+    [ProducesResponseType(typeof(SalesSlipDto), StatusCodes.Status201Created)]
+    public async Task<ActionResult<SalesSlipDto>> Create([FromBody] CreateSalesSlipRequest request, CancellationToken ct)
+    {
+        var result = await _slips.CreateAsync(request, ct);
+        SetETag(result.RowVersion);
+        return Created($"/api/v1/sales-slips/{result.Value.SalesSlipId}", result.Value);
+    }
+
+    [HttpPut("{salesSlipId:int}")]
+    [ProducesResponseType(typeof(SalesSlipDto), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    [ProducesResponseType(StatusCodes.Status412PreconditionFailed)]
+    public async Task<ActionResult<SalesSlipDto>> Update(int salesSlipId, [FromBody] UpdateSalesSlipRequest request, CancellationToken ct)
+    {
+        var expected = RequireIfMatch();
+        var result = await _slips.UpdateAsync(salesSlipId, request, expected, ct);
+        SetETag(result.RowVersion);
+        return Ok(result.Value);
+    }
+
+    [HttpPost("{salesSlipId:int}/post")]
+    [ProducesResponseType(typeof(SalesSlipDto), StatusCodes.Status200OK)]
+    public async Task<ActionResult<SalesSlipDto>> Post(int salesSlipId, CancellationToken ct)
+        => Ok(await _slips.PostAsync(salesSlipId, ct));
+
+    [HttpPost("{salesSlipId:int}/cancel")]
+    [ProducesResponseType(typeof(SalesSlipDto), StatusCodes.Status200OK)]
+    public async Task<ActionResult<SalesSlipDto>> Cancel(int salesSlipId, CancellationToken ct)
+        => Ok(await _slips.CancelAsync(salesSlipId, ct));
+}
diff --git a/Backend/ERPCore/Domain/DocumentTypes.cs b/Backend/ERPCore/Domain/DocumentTypes.cs
index 564e516..cbd91da 100644
--- a/Backend/ERPCore/Domain/DocumentTypes.cs
+++ b/Backend/ERPCore/Domain/DocumentTypes.cs
@@ -17,4 +17,7 @@ public static class DocumentTypes
 
     /// <summary>Production run (docs/30 FR-MFG-08) — <c>PRD-2026-00001</c>.</summary>
     public const string Production = "PRD";
+    public const string SalesInvoice = "SI";
+    public const string SalesSlip = "SSL";
+    public const string BundleSale = "BND";
 }
diff --git a/Backend/ERPCore/Domain/Entities/BundleSale.cs b/Backend/ERPCore/Domain/Entities/BundleSale.cs
new file mode 100644
index 0000000..3129935
--- /dev/null
+++ b/Backend/ERPCore/Domain/Entities/BundleSale.cs
@@ -0,0 +1,33 @@
+using ERPCore.Domain.Enums;
+
+namespace ERPCore.Domain.Entities;
+
+public class BundleSale
+{
+    public int BundleSaleId { get; set; }
+    public string BundleNo { get; set; } = string.Empty;
+    public DateTime BundleDate { get; set; }
+    public int CustomerId { get; set; }
+    public Customer? Customer { get; set; }
+    public string CustomerSnapshotName { get; set; } = string.Empty;
+    public int WarehouseId { get; set; }
+    public Warehouse? Warehouse { get; set; }
+    public int CashierUserId { get; set; }
+    public User? CashierUser { get; set; }
+    public int BundleSaleTemplateId { get; set; }
+    public BundleSaleTemplate? BundleSaleTemplate { get; set; }
+    public string BundleName { get; set; } = string.Empty;
+    public string BundleCode { get; set; } = string.Empty;
+    public BundleSaleStatus Status { get; set; } = BundleSaleStatus.Draft;
+    public decimal ComponentSubtotal { get; set; }
+    public decimal BundlePrice { get; set; }
+    public decimal MarginAmount { get; set; }
+    public decimal DiscountTotal { get; set; }
+    public decimal TaxTotal { get; set; }
+    public decimal GrandTotal { get; set; }
+    public DateTime CreatedAt { get; set; }
+    public DateTime? UpdatedAt { get; set; }
+    public int ConcurrencyStamp { get; set; }
+
+    public ICollection<BundleSaleLine> Lines { get; set; } = new List<BundleSaleLine>();
+}
diff --git a/Backend/ERPCore/Domain/Entities/BundleSaleLine.cs b/Backend/ERPCore/Domain/Entities/BundleSaleLine.cs
new file mode 100644
index 0000000..fecf7ef
--- /dev/null
+++ b/Backend/ERPCore/Domain/Entities/BundleSaleLine.cs
@@ -0,0 +1,24 @@
+using ERPCore.Domain.Enums;
+
+namespace ERPCore.Domain.Entities;
+
+public class BundleSaleLine
+{
+    public int BundleSaleLineId { get; set; }
+    public int BundleSaleId { get; set; }
+    public BundleSale? BundleSale { get; set; }
+
+    public int ItemId { get; set; }
+    public Item? Item { get; set; }
+    public string Description { get; set; } = string.Empty;
+    public decimal Qty { get; set; }
+    public int UomId { get; set; }
+    public Uom? Uom { get; set; }
+    public int WarehouseId { get; set; }
+    public Warehouse? Warehouse { get; set; }
+    public decimal UnitPrice { get; set; }
+    public decimal LineTotal { get; set; }
+    public bool IncludeInBundle { get; set; } = true;
+    public bool IsComponent { get; set; } = true;
+    public int? ParentLineId { get; set; }
+}
diff --git a/Backend/ERPCore/Domain/Entities/BundleSaleTemplate.cs b/Backend/ERPCore/Domain/Entities/BundleSaleTemplate.cs
new file mode 100644
index 0000000..0343a23
--- /dev/null
+++ b/Backend/ERPCore/Domain/Entities/BundleSaleTemplate.cs
@@ -0,0 +1,17 @@
+using ERPCore.Domain.Enums;
+
+namespace ERPCore.Domain.Entities;
+
+public class BundleSaleTemplate
+{
+    public int BundleSaleTemplateId { get; set; }
+    public string TemplateCode { get; set; } = string.Empty;
+    public string TemplateName { get; set; } = string.Empty;
+    public string? Description { get; set; }
+    public EntityStatus Status { get; set; } = EntityStatus.Active;
+    public DateTime CreatedAt { get; set; }
+    public DateTime? UpdatedAt { get; set; }
+    public int ConcurrencyStamp { get; set; }
+
+    public ICollection<BundleSaleTemplateLine> Lines { get; set; } = new List<BundleSaleTemplateLine>();
+}
diff --git a/Backend/ERPCore/Domain/Entities/BundleSaleTemplateLine.cs b/Backend/ERPCore/Domain/Entities/BundleSaleTemplateLine.cs
new file mode 100644
index 0000000..e41414b
--- /dev/null
+++ b/Backend/ERPCore/Domain/Entities/BundleSaleTemplateLine.cs
@@ -0,0 +1,20 @@
+namespace ERPCore.Domain.Entities;
+
+public class BundleSaleTemplateLine
+{
+    public int BundleSaleTemplateLineId { get; set; }
+    public int BundleSaleTemplateId { get; set; }
+    public BundleSaleTemplate? BundleSaleTemplate { get; set; }
+
+    public int ItemId { get; set; }
+    public Item? Item { get; set; }
+    public int UomId { get; set; }
+    public Uom? Uom { get; set; }
+    public int WarehouseId { get; set; }
+    public Warehouse? Warehouse { get; set; }
+
+    public decimal Qty { get; set; }
+    public decimal UnitPrice { get; set; }
+    public bool IncludeInBundle { get; set; } = true;
+    public int SortOrder { get; set; }
+}
diff --git a/Backend/ERPCore/Domain/Entities/Customer.cs b/Backend/ERPCore/Domain/Entities/Customer.cs
new file mode 100644
index 0000000..916a1b9
--- /dev/null
+++ b/Backend/ERPCore/Domain/Entities/Customer.cs
@@ -0,0 +1,38 @@
+using ERPCore.Domain.Enums;
+
+namespace ERPCore.Domain.Entities;
+
+/// <summary>
+/// Customer master for both B2B and B2C sales.
+/// Phase 1 keeps this lean: identity, contact, tax, credit, and default warehouse.
+/// </summary>
+public class Customer
+{
+    public int CustomerId { get; set; }
+    public string CustomerCode { get; set; } = string.Empty;
+    public CustomerType CustomerType { get; set; } = CustomerType.B2C;
+
+    public string Name { get; set; } = string.Empty;
+    public string? DisplayName { get; set; }
+    public string? Phone { get; set; }
+    public string? Email { get; set; }
+
+    public string? AddressLine1 { get; set; }
+    public string? AddressLine2 { get; set; }
+    public string? City { get; set; }
+    public string? Country { get; set; }
+
+    public string? TaxRegistrationNo { get; set; }
+    public decimal CreditLimit { get; set; }
+    public int CreditDays { get; set; }
+
+    public int? DefaultWarehouseId { get; set; }
+    public Warehouse? DefaultWarehouse { get; set; }
+
+    public EntityStatus Status { get; set; } = EntityStatus.Active;
+    public DateTime CreatedAt { get; set; }
+    public DateTime? UpdatedAt { get; set; }
+
+    /// <summary>PostgreSQL xmin-backed optimistic concurrency token (ETag source).</summary>
+    public uint RowVersion { get; set; }
+}
diff --git a/Backend/ERPCore/Domain/Entities/SalesInvoice.cs b/Backend/ERPCore/Domain/Entities/SalesInvoice.cs
new file mode 100644
index 0000000..15f40de
--- /dev/null
+++ b/Backend/ERPCore/Domain/Entities/SalesInvoice.cs
@@ -0,0 +1,41 @@
+using ERPCore.Domain.Enums;
+
+namespace ERPCore.Domain.Entities;
+
+public class SalesInvoice
+{
+    public int SalesInvoiceId { get; set; }
+    public string InvoiceNo { get; set; } = string.Empty;
+    public DateTime InvoiceDate { get; set; }
+
+    public int CustomerId { get; set; }
+    public Customer? Customer { get; set; }
+
+    public string CustomerSnapshotName { get; set; } = string.Empty;
+    public string? CustomerSnapshotTaxNo { get; set; }
+
+    public int WarehouseId { get; set; }
+    public Warehouse? Warehouse { get; set; }
+
+    public SalesInvoiceType InvoiceType { get; set; } = SalesInvoiceType.B2C;
+    public SalesInvoiceStatus Status { get; set; } = SalesInvoiceStatus.Draft;
+
+    public decimal Subtotal { get; set; }
+    public decimal DiscountTotal { get; set; }
+    public decimal TaxTotal { get; set; }
+    public decimal GrandTotal { get; set; }
+    public decimal RoundOff { get; set; }
+    public decimal NetPayable { get; set; }
+    public decimal PaidAmount { get; set; }
+    public decimal BalanceAmount { get; set; }
+
+    public int CreatedBy { get; set; }
+    public User? Creator { get; set; }
+
+    public DateTime CreatedAt { get; set; }
+    public DateTime? UpdatedAt { get; set; }
+
+    public uint RowVersion { get; set; }
+
+    public ICollection<SalesInvoiceLine> Lines { get; set; } = new List<SalesInvoiceLine>();
+}
diff --git a/Backend/ERPCore/Domain/Entities/SalesInvoiceLine.cs b/Backend/ERPCore/Domain/Entities/SalesInvoiceLine.cs
new file mode 100644
index 0000000..e7e4beb
--- /dev/null
+++ b/Backend/ERPCore/Domain/Entities/SalesInvoiceLine.cs
@@ -0,0 +1,38 @@
+using ERPCore.Domain.Enums;
+
+namespace ERPCore.Domain.Entities;
+
+public class SalesInvoiceLine
+{
+    public int SalesInvoiceLineId { get; set; }
+
+    public int SalesInvoiceId { get; set; }
+    public SalesInvoice? SalesInvoice { get; set; }
+
+    public int ItemId { get; set; }
+    public Item? Item { get; set; }
+
+    public string Description { get; set; } = string.Empty;
+
+    public decimal Qty { get; set; }
+    public decimal FreeQty { get; set; }
+    public int UomId { get; set; }
+    public Uom? Uom { get; set; }
+    public int WarehouseId { get; set; }
+    public Warehouse? Warehouse { get; set; }
+
+    public decimal UnitPrice { get; set; }
+    public decimal BaseCost { get; set; }
+    public string PriceSource { get; set; } = string.Empty;
+    public SalesDiscountMode DiscountMode { get; set; } = SalesDiscountMode.Percentage;
+    public decimal DiscountPct { get; set; }
+    public decimal DiscountAmount { get; set; }
+    public decimal NetUnitPrice { get; set; }
+    public decimal LineTotal { get; set; }
+    public decimal TaxPct { get; set; }
+    public decimal TaxAmount { get; set; }
+    public bool IsFreeIssue { get; set; }
+    public int? ParentLineId { get; set; }
+
+    public uint RowVersion { get; set; }
+}
diff --git a/Backend/ERPCore/Domain/Entities/SalesSlip.cs b/Backend/ERPCore/Domain/Entities/SalesSlip.cs
new file mode 100644
index 0000000..46f697a
--- /dev/null
+++ b/Backend/ERPCore/Domain/Entities/SalesSlip.cs
@@ -0,0 +1,36 @@
+using ERPCore.Domain.Enums;
+
+namespace ERPCore.Domain.Entities;
+
+public class SalesSlip
+{
+    public int SalesSlipId { get; set; }
+    public string SlipNo { get; set; } = string.Empty;
+    public DateTime SlipDate { get; set; }
+
+    public int CustomerId { get; set; }
+    public Customer? Customer { get; set; }
+
+    public string CustomerSnapshotName { get; set; } = string.Empty;
+    public int WarehouseId { get; set; }
+    public Warehouse? Warehouse { get; set; }
+
+    public int CashierUserId { get; set; }
+    public User? CashierUser { get; set; }
+
+    public SalesSlipStatus Status { get; set; } = SalesSlipStatus.Draft;
+
+    public decimal Subtotal { get; set; }
+    public decimal DiscountTotal { get; set; }
+    public decimal TaxTotal { get; set; }
+    public decimal GrandTotal { get; set; }
+    public decimal PaidAmount { get; set; }
+    public decimal BalanceAmount { get; set; }
+
+    public DateTime CreatedAt { get; set; }
+    public DateTime? UpdatedAt { get; set; }
+
+    public uint RowVersion { get; set; }
+
+    public ICollection<SalesSlipLine> Lines { get; set; } = new List<SalesSlipLine>();
+}
diff --git a/Backend/ERPCore/Domain/Entities/SalesSlipLine.cs b/Backend/ERPCore/Domain/Entities/SalesSlipLine.cs
new file mode 100644
index 0000000..0eb3de2
--- /dev/null
+++ b/Backend/ERPCore/Domain/Entities/SalesSlipLine.cs
@@ -0,0 +1,38 @@
+using ERPCore.Domain.Enums;
+
+namespace ERPCore.Domain.Entities;
+
+public class SalesSlipLine
+{
+    public int SalesSlipLineId { get; set; }
+
+    public int SalesSlipId { get; set; }
+    public SalesSlip? SalesSlip { get; set; }
+
+    public int ItemId { get; set; }
+    public Item? Item { get; set; }
+
+    public string Description { get; set; } = string.Empty;
+
+    public decimal Qty { get; set; }
+    public decimal FreeQty { get; set; }
+    public int UomId { get; set; }
+    public Uom? Uom { get; set; }
+    public int WarehouseId { get; set; }
+    public Warehouse? Warehouse { get; set; }
+
+    public decimal UnitPrice { get; set; }
+    public decimal BaseCost { get; set; }
+    public string PriceSource { get; set; } = string.Empty;
+    public SalesDiscountMode DiscountMode { get; set; } = SalesDiscountMode.Percentage;
+    public decimal DiscountPct { get; set; }
+    public decimal DiscountAmount { get; set; }
+    public decimal NetUnitPrice { get; set; }
+    public decimal LineTotal { get; set; }
+    public decimal TaxPct { get; set; }
+    public decimal TaxAmount { get; set; }
+    public bool IsFreeIssue { get; set; }
+    public int? ParentLineId { get; set; }
+
+    public uint RowVersion { get; set; }
+}
diff --git a/Backend/ERPCore/Domain/Enums/BundleSaleStatus.cs b/Backend/ERPCore/Domain/Enums/BundleSaleStatus.cs
new file mode 100644
index 0000000..a17d0eb
--- /dev/null
+++ b/Backend/ERPCore/Domain/Enums/BundleSaleStatus.cs
@@ -0,0 +1,8 @@
+namespace ERPCore.Domain.Enums;
+
+public enum BundleSaleStatus
+{
+    Draft = 0,
+    Posted = 1,
+    Cancelled = 2
+}
diff --git a/Backend/ERPCore/Domain/Enums/CustomerType.cs b/Backend/ERPCore/Domain/Enums/CustomerType.cs
new file mode 100644
index 0000000..5928ba5
--- /dev/null
+++ b/Backend/ERPCore/Domain/Enums/CustomerType.cs
@@ -0,0 +1,8 @@
+namespace ERPCore.Domain.Enums;
+
+public enum CustomerType
+{
+    B2B = 1,
+    B2C = 2,
+    WalkIn = 3
+}
diff --git a/Backend/ERPCore/Domain/Enums/SalesDiscountMode.cs b/Backend/ERPCore/Domain/Enums/SalesDiscountMode.cs
new file mode 100644
index 0000000..6f26fb2
--- /dev/null
+++ b/Backend/ERPCore/Domain/Enums/SalesDiscountMode.cs
@@ -0,0 +1,7 @@
+namespace ERPCore.Domain.Enums;
+
+public enum SalesDiscountMode
+{
+    Percentage = 1,
+    Amount = 2
+}
diff --git a/Backend/ERPCore/Domain/Enums/SalesInvoiceStatus.cs b/Backend/ERPCore/Domain/Enums/SalesInvoiceStatus.cs
new file mode 100644
index 0000000..b3c4aab
--- /dev/null
+++ b/Backend/ERPCore/Domain/Enums/SalesInvoiceStatus.cs
@@ -0,0 +1,8 @@
+namespace ERPCore.Domain.Enums;
+
+public enum SalesInvoiceStatus
+{
+    Draft = 1,
+    Posted = 2,
+    Cancelled = 3
+}
diff --git a/Backend/ERPCore/Domain/Enums/SalesInvoiceType.cs b/Backend/ERPCore/Domain/Enums/SalesInvoiceType.cs
new file mode 100644
index 0000000..375c497
--- /dev/null
+++ b/Backend/ERPCore/Domain/Enums/SalesInvoiceType.cs
@@ -0,0 +1,9 @@
+namespace ERPCore.Domain.Enums;
+
+public enum SalesInvoiceType
+{
+    B2B = 1,
+    B2C = 2,
+    Cash = 3,
+    Credit = 4
+}
diff --git a/Backend/ERPCore/Domain/Enums/SalesSlipStatus.cs b/Backend/ERPCore/Domain/Enums/SalesSlipStatus.cs
new file mode 100644
index 0000000..400d11f
--- /dev/null
+++ b/Backend/ERPCore/Domain/Enums/SalesSlipStatus.cs
@@ -0,0 +1,8 @@
+namespace ERPCore.Domain.Enums;
+
+public enum SalesSlipStatus
+{
+    Draft = 1,
+    Posted = 2,
+    Cancelled = 3
+}
diff --git a/Backend/ERPCore/Dtos/Customers/CustomerDtos.cs b/Backend/ERPCore/Dtos/Customers/CustomerDtos.cs
new file mode 100644
index 0000000..3b7175d
--- /dev/null
+++ b/Backend/ERPCore/Dtos/Customers/CustomerDtos.cs
@@ -0,0 +1,66 @@
+using System.ComponentModel.DataAnnotations;
+using ERPCore.Domain.Enums;
+
+namespace ERPCore.Dtos.Customers;
+
+/// <summary>Customer resource used by sales documents.</summary>
+public sealed record CustomerDto(
+    int CustomerId,
+    string CustomerCode,
+    CustomerType CustomerType,
+    string Name,
+    string? DisplayName,
+    string? Phone,
+    string? Email,
+    string? AddressLine1,
+    string? AddressLine2,
+    string? City,
+    string? Country,
+    string? TaxRegistrationNo,
+    decimal CreditLimit,
+    int CreditDays,
+    int? DefaultWarehouseId,
+    EntityStatus Status,
+    DateTime CreatedAt,
+    DateTime? UpdatedAt);
+
+public sealed class CreateCustomerRequest
+{
+    [Required, StringLength(50)] public string CustomerCode { get; set; } = string.Empty;
+    [Required, EnumDataType(typeof(CustomerType))] public CustomerType CustomerType { get; set; } = CustomerType.B2C;
+    [Required, StringLength(200)] public string Name { get; set; } = string.Empty;
+    [StringLength(200)] public string? DisplayName { get; set; }
+    [StringLength(30)] public string? Phone { get; set; }
+    [StringLength(100)] public string? Email { get; set; }
+    [StringLength(250)] public string? AddressLine1 { get; set; }
+    [StringLength(250)] public string? AddressLine2 { get; set; }
+    [StringLength(100)] public string? City { get; set; }
+    [StringLength(100)] public string? Country { get; set; }
+    [StringLength(50)] public string? TaxRegistrationNo { get; set; }
+    [Range(0, double.MaxValue)] public decimal CreditLimit { get; set; }
+    [Range(0, int.MaxValue)] public int CreditDays { get; set; }
+    public int? DefaultWarehouseId { get; set; }
+}
+
+public sealed class UpdateCustomerRequest
+{
+    [Required, StringLength(50)] public string CustomerCode { get; set; } = string.Empty;
+    [Required, EnumDataType(typeof(CustomerType))] public CustomerType CustomerType { get; set; } = CustomerType.B2C;
+    [Required, StringLength(200)] public string Name { get; set; } = string.Empty;
+    [StringLength(200)] public string? DisplayName { get; set; }
+    [StringLength(30)] public string? Phone { get; set; }
+    [StringLength(100)] public string? Email { get; set; }
+    [StringLength(250)] public string? AddressLine1 { get; set; }
+    [StringLength(250)] public string? AddressLine2 { get; set; }
+    [StringLength(100)] public string? City { get; set; }
+    [StringLength(100)] public string? Country { get; set; }
+    [StringLength(50)] public string? TaxRegistrationNo { get; set; }
+    [Range(0, double.MaxValue)] public decimal CreditLimit { get; set; }
+    [Range(0, int.MaxValue)] public int CreditDays { get; set; }
+    public int? DefaultWarehouseId { get; set; }
+}
+
+public sealed class UpdateCustomerStatusRequest
+{
+    [Required, EnumDataType(typeof(EntityStatus))] public EntityStatus Status { get; set; }
+}
diff --git a/Backend/ERPCore/Dtos/Sales/BundleSaleDtos.cs b/Backend/ERPCore/Dtos/Sales/BundleSaleDtos.cs
new file mode 100644
index 0000000..7d14af7
--- /dev/null
+++ b/Backend/ERPCore/Dtos/Sales/BundleSaleDtos.cs
@@ -0,0 +1,83 @@
+using System.ComponentModel.DataAnnotations;
+using ERPCore.Domain.Enums;
+
+namespace ERPCore.Dtos.Sales;
+
+public sealed record BundleSaleLineDto(
+    int BundleSaleLineId, int ItemId, string Description, decimal Qty, int UomId, int WarehouseId,
+    decimal UnitPrice, decimal LineTotal, bool IncludeInBundle, bool IsComponent, int? ParentLineId);
+
+public sealed record BundleSaleDto(
+    int BundleSaleId, string BundleNo, DateTime BundleDate, int CustomerId, string CustomerSnapshotName,
+    int WarehouseId, int CashierUserId, int BundleSaleTemplateId, string BundleName, string BundleCode,
+    BundleSaleStatus Status, decimal ComponentSubtotal, decimal BundlePrice, decimal MarginAmount,
+    decimal DiscountTotal, decimal TaxTotal, decimal GrandTotal, DateTime CreatedAt, DateTime? UpdatedAt,
+    IReadOnlyList<BundleSaleLineDto> Lines);
+
+public sealed record BundleSaleSummaryDto(
+    int BundleSaleId, string BundleNo, DateTime BundleDate, int CustomerId, string CustomerSnapshotName,
+    int WarehouseId, string BundleName, string BundleCode, BundleSaleStatus Status,
+    decimal ComponentSubtotal, decimal BundlePrice, decimal GrandTotal, DateTime CreatedAt);
+
+public sealed record BundleSaleTemplateLineDto(
+    int BundleSaleTemplateLineId, int ItemId, int UomId, int WarehouseId, decimal Qty,
+    decimal UnitPrice, bool IncludeInBundle, int SortOrder);
+
+public sealed record BundleSaleTemplateDto(
+    int BundleSaleTemplateId, string TemplateCode, string TemplateName, string? Description,
+    EntityStatus Status, DateTime CreatedAt, DateTime? UpdatedAt, IReadOnlyList<BundleSaleTemplateLineDto> Lines);
+
+public sealed record BundleSaleTemplateSummaryDto(
+    int BundleSaleTemplateId, string TemplateCode, string TemplateName, string? Description,
+    EntityStatus Status, int LineCount, DateTime CreatedAt, DateTime? UpdatedAt);
+
+public sealed record BundleSalePostingIssueDto(
+    int BundleSaleLineId, int ItemId, string ItemSku, string ItemName, int WarehouseId,
+    decimal RequestedQty, decimal AvailableQty, decimal ShortQty);
+
+public sealed record BundleSalePostingCheckDto(
+    int BundleSaleId, string BundleNo, BundleSaleStatus Status, bool CanPost,
+    IReadOnlyList<BundleSalePostingIssueDto> Issues);
+
+public sealed class CreateBundleSaleTemplateLineRequest
+{
+    [Required] public int ItemId { get; set; }
+    [Required] public int UomId { get; set; }
+    [Required] public int WarehouseId { get; set; }
+    [Range(0.0001, double.MaxValue)] public decimal Qty { get; set; }
+    [Range(0, double.MaxValue)] public decimal UnitPrice { get; set; }
+    public bool IncludeInBundle { get; set; } = true;
+    public int SortOrder { get; set; }
+}
+
+public sealed class CreateBundleSaleTemplateRequest
+{
+    [Required] public string TemplateCode { get; set; } = string.Empty;
+    [Required] public string TemplateName { get; set; } = string.Empty;
+    public string? Description { get; set; }
+    [Required, MinLength(1)] public List<CreateBundleSaleTemplateLineRequest> Lines { get; set; } = new();
+}
+
+public sealed class CreateBundleSaleRequest
+{
+    [Required] public int CustomerId { get; set; }
+    [Required] public int WarehouseId { get; set; }
+    [Required] public int CashierUserId { get; set; }
+    [Required] public int BundleSaleTemplateId { get; set; }
+    [Required] public string BundleName { get; set; } = string.Empty;
+    [Range(0, double.MaxValue)] public decimal BundlePrice { get; set; }
+    public bool AllowPriceOverride { get; set; }
+    [Required, MinLength(1)] public List<CreateBundleSaleTemplateLineRequest> Lines { get; set; } = new();
+}
+
+public sealed class UpdateBundleSaleRequest
+{
+    [Required] public int CustomerId { get; set; }
+    [Required] public int WarehouseId { get; set; }
+    [Required] public int CashierUserId { get; set; }
+    [Required] public int BundleSaleTemplateId { get; set; }
+    [Required] public string BundleName { get; set; } = string.Empty;
+    [Range(0, double.MaxValue)] public decimal BundlePrice { get; set; }
+    public bool AllowPriceOverride { get; set; }
+    [Required, MinLength(1)] public List<CreateBundleSaleTemplateLineRequest> Lines { get; set; } = new();
+}
diff --git a/Backend/ERPCore/Dtos/Sales/SalesInvoiceDtos.cs b/Backend/ERPCore/Dtos/Sales/SalesInvoiceDtos.cs
new file mode 100644
index 0000000..c541132
--- /dev/null
+++ b/Backend/ERPCore/Dtos/Sales/SalesInvoiceDtos.cs
@@ -0,0 +1,67 @@
+using System.ComponentModel.DataAnnotations;
+using ERPCore.Domain.Enums;
+
+namespace ERPCore.Dtos.Sales;
+
+public sealed record SalesInvoiceLineDto(
+    int SalesInvoiceLineId, int ItemId, string Description, decimal Qty, decimal FreeQty, int UomId,
+    int WarehouseId, decimal UnitPrice, decimal BaseCost, string PriceSource, decimal DiscountPct,
+    decimal DiscountAmount, SalesDiscountMode DiscountMode, decimal NetUnitPrice, decimal LineTotal,
+    decimal TaxPct, decimal TaxAmount, bool IsFreeIssue, int? ParentLineId);
+
+public sealed record SalesInvoiceTotalsDto(
+    decimal Subtotal, decimal DiscountTotal, decimal FreeQtyTotal, decimal TaxTotal, decimal GrandTotal,
+    decimal RoundOff, decimal NetPayable, decimal PaidAmount, decimal BalanceAmount);
+
+public sealed record SalesInvoiceDto(
+    int SalesInvoiceId, string InvoiceNo, DateTime InvoiceDate, int CustomerId,
+    string CustomerSnapshotName, string? CustomerSnapshotTaxNo, int WarehouseId,
+    SalesInvoiceType InvoiceType, SalesInvoiceStatus Status, int CreatedBy, DateTime CreatedAt,
+    DateTime? UpdatedAt, SalesInvoiceTotalsDto Totals, IReadOnlyList<SalesInvoiceLineDto> Lines);
+
+public sealed record SalesInvoiceSummaryDto(
+    int SalesInvoiceId, string InvoiceNo, DateTime InvoiceDate, int CustomerId,
+    string CustomerSnapshotName, int WarehouseId, SalesInvoiceType InvoiceType,
+    SalesInvoiceStatus Status, SalesInvoiceTotalsDto Totals, DateTime CreatedAt);
+
+public sealed record SalesInvoicePostingIssueDto(
+    int SalesInvoiceLineId, int ItemId, string ItemSku, string ItemName, int WarehouseId,
+    decimal RequestedQty, decimal AvailableQty, decimal ShortQty, bool IsFreeIssue);
+
+public sealed record SalesInvoicePostingCheckDto(
+    int SalesInvoiceId, string InvoiceNo, SalesInvoiceStatus Status, bool CanPost,
+    IReadOnlyList<SalesInvoicePostingIssueDto> Issues);
+
+public sealed class CreateSalesInvoiceLineRequest
+{
+    [Required] public int ItemId { get; set; }
+    [Required] public int UomId { get; set; }
+    [Required] public int WarehouseId { get; set; }
+    [Range(0.0001, double.MaxValue)] public decimal Qty { get; set; }
+    [Range(0, double.MaxValue)] public decimal FreeQty { get; set; }
+    [Range(0, double.MaxValue)] public decimal? UnitPrice { get; set; }
+    public bool AllowManualPriceOverride { get; set; }
+    [Required, EnumDataType(typeof(SalesDiscountMode))] public SalesDiscountMode DiscountMode { get; set; } = SalesDiscountMode.Percentage;
+    [Range(0, 100)] public decimal DiscountPct { get; set; }
+    [Range(0, double.MaxValue)] public decimal DiscountAmount { get; set; }
+    [Range(0, double.MaxValue)] public decimal DiscountValue { get; set; }
+    [Range(0, 100)] public decimal TaxPct { get; set; }
+    public bool IsFreeIssue { get; set; }
+    public int? ParentLineId { get; set; }
+}
+
+public sealed class CreateSalesInvoiceRequest
+{
+    [Required] public int CustomerId { get; set; }
+    [Required] public int WarehouseId { get; set; }
+    [Required, EnumDataType(typeof(SalesInvoiceType))] public SalesInvoiceType InvoiceType { get; set; } = SalesInvoiceType.B2C;
+    [Required, MinLength(1)] public List<CreateSalesInvoiceLineRequest> Lines { get; set; } = new();
+}
+
+public sealed class UpdateSalesInvoiceRequest
+{
+    [Required] public int CustomerId { get; set; }
+    [Required] public int WarehouseId { get; set; }
+    [Required, EnumDataType(typeof(SalesInvoiceType))] public SalesInvoiceType InvoiceType { get; set; } = SalesInvoiceType.B2C;
+    [Required, MinLength(1)] public List<CreateSalesInvoiceLineRequest> Lines { get; set; } = new();
+}
diff --git a/Backend/ERPCore/Dtos/Sales/SalesPromotionSuggestionDtos.cs b/Backend/ERPCore/Dtos/Sales/SalesPromotionSuggestionDtos.cs
new file mode 100644
index 0000000..dffd1c8
--- /dev/null
+++ b/Backend/ERPCore/Dtos/Sales/SalesPromotionSuggestionDtos.cs
@@ -0,0 +1,23 @@
+namespace ERPCore.Dtos.Sales;
+
+public sealed record SalesFreeIssueRewardOptionDto(
+    int ItemId,
+    string Sku,
+    string Name,
+    decimal? SalePrice);
+
+public sealed record SalesFreeIssueSuggestionLineDto(
+    int SalesSlipLineId,
+    int ItemId,
+    string ItemSku,
+    string ItemName,
+    decimal Qty,
+    decimal SuggestedFreeQty,
+    decimal TriggerQty,
+    IReadOnlyList<SalesFreeIssueRewardOptionDto> RewardOptions);
+
+public sealed record SalesFreeIssueSuggestionDto(
+    int SalesSlipId,
+    string SlipNo,
+    DateTime SlipDate,
+    IReadOnlyList<SalesFreeIssueSuggestionLineDto> Lines);
\ No newline at end of file
diff --git a/Backend/ERPCore/Dtos/Sales/SalesReportDtos.cs b/Backend/ERPCore/Dtos/Sales/SalesReportDtos.cs
new file mode 100644
index 0000000..bea474c
--- /dev/null
+++ b/Backend/ERPCore/Dtos/Sales/SalesReportDtos.cs
@@ -0,0 +1,68 @@
+namespace ERPCore.Dtos.Sales;
+
+public sealed record SalesDailySummaryRowDto(
+    DateOnly Date,
+    int InvoiceCount,
+    int SlipCount,
+    decimal InvoiceSubtotal,
+    decimal SlipSubtotal,
+    decimal DiscountTotal,
+    decimal FreeQtyTotal,
+    decimal TaxTotal,
+    decimal GrandTotal);
+
+public sealed record SalesItemSummaryRowDto(
+    int ItemId,
+    string ItemName,
+    decimal SoldQty,
+    decimal FreeQty,
+    decimal GrossAmount,
+    decimal DiscountTotal,
+    decimal TaxTotal,
+    decimal NetAmount);
+
+public sealed record SalesCustomerSummaryRowDto(
+    int CustomerId,
+    string CustomerName,
+    int InvoiceCount,
+    int SlipCount,
+    decimal SoldQty,
+    decimal FreeQty,
+    decimal GrossAmount,
+    decimal DiscountTotal,
+    decimal TaxTotal,
+    decimal NetAmount);
+
+public sealed record SalesWarehouseSummaryRowDto(
+    int WarehouseId,
+    string WarehouseName,
+    int InvoiceCount,
+    int SlipCount,
+    decimal SoldQty,
+    decimal FreeQty,
+    decimal GrossAmount,
+    decimal DiscountTotal,
+    decimal TaxTotal,
+    decimal NetAmount);
+
+public sealed record SalesDiscountSummaryRowDto(
+    string DocumentType,
+    string DocumentNo,
+    DateTime DocumentDate,
+    string CustomerName,
+    decimal Subtotal,
+    decimal DiscountTotal,
+    decimal TaxTotal,
+    decimal NetAmount);
+
+public sealed record SalesFreeIssueSummaryRowDto(
+    string DocumentType,
+    string DocumentNo,
+    DateTime DocumentDate,
+    string CustomerName,
+    int ItemId,
+    string ItemName,
+    decimal FreeQty,
+    decimal FreeValue,
+    int WarehouseId,
+    string WarehouseName);
diff --git a/Backend/ERPCore/Dtos/Sales/SalesReportQueryDtos.cs b/Backend/ERPCore/Dtos/Sales/SalesReportQueryDtos.cs
new file mode 100644
index 0000000..c900df0
--- /dev/null
+++ b/Backend/ERPCore/Dtos/Sales/SalesReportQueryDtos.cs
@@ -0,0 +1,21 @@
+namespace ERPCore.Dtos.Sales;
+
+public sealed record SalesReportDefinitionDto(
+    string Id,
+    string Name,
+    string Description,
+    IReadOnlyList<string> SupportedFilters);
+
+public sealed record SalesReportQueryRequest(
+    string ReportType,
+    DateOnly From,
+    DateOnly To,
+    int? ItemId = null,
+    int? CustomerId = null,
+    int? WarehouseId = null);
+
+public sealed record SalesReportQueryResponse(
+    string ReportType,
+    DateOnly From,
+    DateOnly To,
+    IReadOnlyList<object> Rows);
diff --git a/Backend/ERPCore/Dtos/Sales/SalesSlipDtos.cs b/Backend/ERPCore/Dtos/Sales/SalesSlipDtos.cs
new file mode 100644
index 0000000..85ec177
--- /dev/null
+++ b/Backend/ERPCore/Dtos/Sales/SalesSlipDtos.cs
@@ -0,0 +1,77 @@
+using System.ComponentModel.DataAnnotations;
+using ERPCore.Domain.Enums;
+
+namespace ERPCore.Dtos.Sales;
+
+public sealed record SalesSlipLineDto(
+    int SalesSlipLineId, int ItemId, string Description, decimal Qty, decimal FreeQty, int UomId,
+    int WarehouseId, decimal UnitPrice, decimal BaseCost, string PriceSource, decimal DiscountPct,
+    decimal DiscountAmount, SalesDiscountMode DiscountMode, decimal NetUnitPrice, decimal LineTotal,
+    decimal TaxPct, decimal TaxAmount, bool IsFreeIssue, int? ParentLineId);
+
+public sealed record SalesSlipTotalsDto(
+    decimal Subtotal, decimal DiscountTotal, decimal FreeQtyTotal, decimal TaxTotal, decimal GrandTotal,
+    decimal PaidAmount, decimal BalanceAmount);
+
+public sealed record SalesSlipDto(
+    int SalesSlipId, string SlipNo, DateTime SlipDate, int CustomerId,
+    string CustomerSnapshotName, int WarehouseId, int CashierUserId, SalesSlipStatus Status,
+    DateTime CreatedAt, DateTime? UpdatedAt, SalesSlipTotalsDto Totals, IReadOnlyList<SalesSlipLineDto> Lines);
+
+public sealed record SalesSlipSummaryDto(
+    int SalesSlipId, string SlipNo, DateTime SlipDate, int CustomerId,
+    string CustomerSnapshotName, int WarehouseId, SalesSlipStatus Status,
+    SalesSlipTotalsDto Totals, DateTime CreatedAt);
+
+public sealed record SalesSlipPostingIssueDto(
+    int SalesSlipLineId, int ItemId, string ItemSku, string ItemName, int WarehouseId,
+    decimal RequestedQty, decimal AvailableQty, decimal ShortQty, bool IsFreeIssue);
+
+public sealed record SalesSlipPostingCheckDto(
+    int SalesSlipId, string SlipNo, SalesSlipStatus Status, bool CanPost,
+    IReadOnlyList<SalesSlipPostingIssueDto> Issues);
+
+public sealed record FreeIssueSummaryDto(
+    int SalesSlipId, string SlipNo, SalesSlipStatus Status, DateTime CreatedAt,
+    int WarehouseId, string WarehouseName, int ItemId, string ItemSku, string ItemName,
+    int UomId, string UomName, decimal Qty, decimal FreeQty, string SchemeLabel);
+
+public sealed record FreeIssueDto(
+    int SalesSlipId, string SlipNo, DateTime SlipDate, SalesSlipStatus Status,
+    int CustomerId, string CustomerSnapshotName, int WarehouseId, string WarehouseName,
+    int CashierUserId, DateTime CreatedAt, DateTime? UpdatedAt, FreeIssueSummaryDto Summary,
+    IReadOnlyList<SalesSlipLineDto> Lines);
+
+public sealed class CreateSalesSlipLineRequest
+{
+    [Required] public int ItemId { get; set; }
+    [Required] public int UomId { get; set; }
+    [Required] public int WarehouseId { get; set; }
+    [Range(0.0001, double.MaxValue)] public decimal Qty { get; set; }
+    [Range(0, double.MaxValue)] public decimal FreeQty { get; set; }
+    [Range(0, double.MaxValue)] public decimal? UnitPrice { get; set; }
+    public bool AllowManualPriceOverride { get; set; }
+    [Required, EnumDataType(typeof(SalesDiscountMode))] public SalesDiscountMode DiscountMode { get; set; } = SalesDiscountMode.Percentage;
+    [Range(0, 100)] public decimal DiscountPct { get; set; }
+    [Range(0, double.MaxValue)] public decimal DiscountAmount { get; set; }
+    [Range(0, double.MaxValue)] public decimal DiscountValue { get; set; }
+    [Range(0, 100)] public decimal TaxPct { get; set; }
+    public bool IsFreeIssue { get; set; }
+    public int? ParentLineId { get; set; }
+}
+
+public sealed class CreateSalesSlipRequest
+{
+    [Required] public int CustomerId { get; set; }
+    [Required] public int WarehouseId { get; set; }
+    [Required] public int CashierUserId { get; set; }
+    [Required, MinLength(1)] public List<CreateSalesSlipLineRequest> Lines { get; set; } = new();
+}
+
+public sealed class UpdateSalesSlipRequest
+{
+    [Required] public int CustomerId { get; set; }
+    [Required] public int WarehouseId { get; set; }
+    [Required] public int CashierUserId { get; set; }
+    [Required, MinLength(1)] public List<CreateSalesSlipLineRequest> Lines { get; set; } = new();
+}
diff --git a/Backend/ERPCore/Infra/Gl/GeneralLedgerClient.cs b/Backend/ERPCore/Infra/Gl/GeneralLedgerClient.cs
new file mode 100644
index 0000000..170879f
--- /dev/null
+++ b/Backend/ERPCore/Infra/Gl/GeneralLedgerClient.cs
@@ -0,0 +1,55 @@
+using ERPCore.System.Errors;
+
+namespace ERPCore.Infra.Gl;
+
+/// <summary>
+/// HTTP implementation of <see cref="IGeneralLedgerClient"/>. Registered as a typed
+/// client (`AddHttpClient&lt;IGeneralLedgerClient, GeneralLedgerClient&gt;`) with its
+/// `BaseAddress` bound from `GeneralLedgerService:BaseUrl`. Every call attaches the
+/// shared `GeneralLedgerService:ApiKey` as `X-Api-Key` and streams the request/response
+/// body straight through, unparsed — GL's own response (status, content-type, body) is
+/// returned exactly as received; nothing here reshapes it.
+/// </summary>
+public sealed class GeneralLedgerClient(HttpClient http, IConfiguration configuration) : IGeneralLedgerClient
+{
+    private readonly HttpClient _http = http;
+    private readonly string _apiKey = configuration["GeneralLedgerService:ApiKey"] ?? string.Empty;
+
+    public async Task<GeneralLedgerResponse> SendAsync(
+        HttpMethod method, string path, string? queryString, string? contentType, Stream? body, CancellationToken ct)
+    {
+        var relativeUri = path.TrimStart('/') + queryString;
+        using var request = new HttpRequestMessage(method, relativeUri);
+        request.Headers.TryAddWithoutValidation("X-Api-Key", _apiKey);
+
+        if (body is not null && method != HttpMethod.Get)
+        {
+            var content = new StreamContent(body);
+            if (!string.IsNullOrEmpty(contentType))
+                content.Headers.TryAddWithoutValidation("Content-Type", contentType);
+            request.Content = content;
+        }
+
+        HttpResponseMessage response;
+        try
+        {
+            response = await _http.SendAsync(request, ct);
+        }
+        catch (HttpRequestException)
+        {
+            throw new DomainException(ErrorCodes.GlServiceUnavailable, "The General Ledger service is unreachable.", 503);
+        }
+        catch (TaskCanceledException) when (!ct.IsCancellationRequested)
+        {
+            throw new DomainException(ErrorCodes.GlServiceUnavailable, "The General Ledger service timed out.", 503);
+        }
+
+        var responseBody = await response.Content.ReadAsStringAsync(ct);
+        return new GeneralLedgerResponse
+        {
+            StatusCode = (int)response.StatusCode,
+            ContentType = response.Content.Headers.ContentType?.ToString(),
+            Body = responseBody
+        };
+    }
+}
diff --git a/Backend/ERPCore/Infra/Gl/GeneralLedgerResponse.cs b/Backend/ERPCore/Infra/Gl/GeneralLedgerResponse.cs
new file mode 100644
index 0000000..bfaec0c
--- /dev/null
+++ b/Backend/ERPCore/Infra/Gl/GeneralLedgerResponse.cs
@@ -0,0 +1,15 @@
+namespace ERPCore.Infra.Gl;
+
+/// <summary>
+/// Raw HTTP result from the external General Ledger service — status code, content
+/// type, and body exactly as GL returned them. Deliberately un-reshaped: GL's own
+/// envelope (see the GL service's own API reference) is passed through byte-for-byte
+/// so its camelCase-success/PascalCase-error inconsistency and full decimal precision
+/// survive the hop unchanged (docs/12-GENERAL-LEDGER-INTEGRATION.md).
+/// </summary>
+public sealed class GeneralLedgerResponse
+{
+    public int StatusCode { get; init; }
+    public string? ContentType { get; init; }
+    public string Body { get; init; } = string.Empty;
+}
diff --git a/Backend/ERPCore/Infra/Gl/IGeneralLedgerClient.cs b/Backend/ERPCore/Infra/Gl/IGeneralLedgerClient.cs
new file mode 100644
index 0000000..962c0eb
--- /dev/null
+++ b/Backend/ERPCore/Infra/Gl/IGeneralLedgerClient.cs
@@ -0,0 +1,13 @@
+namespace ERPCore.Infra.Gl;
+
+/// <summary>
+/// Typed HTTP transport to the external General Ledger service. Injects the shared
+/// `X-Api-Key` secret and forwards method/path/query/body/content-type verbatim —
+/// see docs/12-GENERAL-LEDGER-INTEGRATION.md. Internal: only
+/// <see cref="ERPCore.Services.Interfaces.IGeneralLedgerService"/> consumes this.
+/// </summary>
+public interface IGeneralLedgerClient
+{
+    Task<GeneralLedgerResponse> SendAsync(
+        HttpMethod method, string path, string? queryString, string? contentType, Stream? body, CancellationToken ct);
+}
diff --git a/Backend/ERPCore/Infra/Persistence/Configurations/BundleSaleConfiguration.cs b/Backend/ERPCore/Infra/Persistence/Configurations/BundleSaleConfiguration.cs
new file mode 100644
index 0000000..d53b314
--- /dev/null
+++ b/Backend/ERPCore/Infra/Persistence/Configurations/BundleSaleConfiguration.cs
@@ -0,0 +1,46 @@
+using ERPCore.Domain.Entities;
+using ERPCore.Domain.Enums;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace ERPCore.Infra.Persistence.Configurations;
+
+public sealed class BundleSaleConfiguration : IEntityTypeConfiguration<BundleSale>
+{
+    public void Configure(EntityTypeBuilder<BundleSale> builder)
+    {
+        builder.ToTable("bundle_sales");
+        builder.HasKey(x => x.BundleSaleId);
+        builder.Property(x => x.BundleNo).IsRequired().HasMaxLength(50);
+        builder.HasIndex(x => x.BundleNo).IsUnique();
+        builder.Property(x => x.BundleDate).IsRequired();
+        builder.Property(x => x.CustomerSnapshotName).IsRequired().HasMaxLength(200);
+        builder.Property(x => x.BundleName).IsRequired().HasMaxLength(200);
+        builder.Property(x => x.BundleCode).IsRequired().HasMaxLength(50);
+        builder.Property(x => x.Status)
+            .HasConversion<string>().HasMaxLength(20).IsRequired()
+            .HasDefaultValue(BundleSaleStatus.Draft);
+        builder.Property(x => x.ComponentSubtotal).HasPrecision(18, 4);
+        builder.Property(x => x.BundlePrice).HasPrecision(18, 4);
+        builder.Property(x => x.MarginAmount).HasPrecision(18, 4);
+        builder.Property(x => x.DiscountTotal).HasPrecision(18, 4);
+        builder.Property(x => x.TaxTotal).HasPrecision(18, 4);
+        builder.Property(x => x.GrandTotal).HasPrecision(18, 4);
+        builder.Property(x => x.CreatedAt).IsRequired();
+        builder.Property(x => x.ConcurrencyStamp)
+            .IsRequired()
+            .HasColumnType("integer")
+            .HasDefaultValue(0)
+            .IsConcurrencyToken();
+
+        builder.HasOne(x => x.Customer).WithMany().HasForeignKey(x => x.CustomerId).OnDelete(DeleteBehavior.Restrict);
+        builder.HasOne(x => x.Warehouse).WithMany().HasForeignKey(x => x.WarehouseId).OnDelete(DeleteBehavior.Restrict);
+        builder.HasOne(x => x.CashierUser).WithMany().HasForeignKey(x => x.CashierUserId).OnDelete(DeleteBehavior.Restrict);
+        builder.HasOne(x => x.BundleSaleTemplate).WithMany().HasForeignKey(x => x.BundleSaleTemplateId).OnDelete(DeleteBehavior.Restrict);
+
+        builder.HasMany(x => x.Lines)
+            .WithOne(x => x.BundleSale)
+            .HasForeignKey(x => x.BundleSaleId)
+            .OnDelete(DeleteBehavior.Cascade);
+    }
+}
diff --git a/Backend/ERPCore/Infra/Persistence/Configurations/BundleSaleLineConfiguration.cs b/Backend/ERPCore/Infra/Persistence/Configurations/BundleSaleLineConfiguration.cs
new file mode 100644
index 0000000..fac3e88
--- /dev/null
+++ b/Backend/ERPCore/Infra/Persistence/Configurations/BundleSaleLineConfiguration.cs
@@ -0,0 +1,24 @@
+using ERPCore.Domain.Entities;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace ERPCore.Infra.Persistence.Configurations;
+
+public sealed class BundleSaleLineConfiguration : IEntityTypeConfiguration<BundleSaleLine>
+{
+    public void Configure(EntityTypeBuilder<BundleSaleLine> builder)
+    {
+        builder.ToTable("bundle_sale_lines");
+        builder.HasKey(x => x.BundleSaleLineId);
+        builder.Property(x => x.Description).IsRequired().HasMaxLength(200);
+        builder.Property(x => x.Qty).HasPrecision(18, 4);
+        builder.Property(x => x.UnitPrice).HasPrecision(18, 4);
+        builder.Property(x => x.LineTotal).HasPrecision(18, 4);
+        builder.Property(x => x.IncludeInBundle).HasDefaultValue(true);
+        builder.Property(x => x.IsComponent).HasDefaultValue(true);
+
+        builder.HasOne(x => x.Item).WithMany().HasForeignKey(x => x.ItemId).OnDelete(DeleteBehavior.Restrict);
+        builder.HasOne(x => x.Uom).WithMany().HasForeignKey(x => x.UomId).OnDelete(DeleteBehavior.Restrict);
+        builder.HasOne(x => x.Warehouse).WithMany().HasForeignKey(x => x.WarehouseId).OnDelete(DeleteBehavior.Restrict);
+    }
+}
diff --git a/Backend/ERPCore/Infra/Persistence/Configurations/BundleSaleTemplateConfiguration.cs b/Backend/ERPCore/Infra/Persistence/Configurations/BundleSaleTemplateConfiguration.cs
new file mode 100644
index 0000000..e580e08
--- /dev/null
+++ b/Backend/ERPCore/Infra/Persistence/Configurations/BundleSaleTemplateConfiguration.cs
@@ -0,0 +1,34 @@
+using ERPCore.Domain.Entities;
+using ERPCore.Domain.Enums;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace ERPCore.Infra.Persistence.Configurations;
+
+public sealed class BundleSaleTemplateConfiguration : IEntityTypeConfiguration<BundleSaleTemplate>
+{
+    public void Configure(EntityTypeBuilder<BundleSaleTemplate> builder)
+    {
+        builder.ToTable("bundle_sale_templates");
+        builder.HasKey(x => x.BundleSaleTemplateId);
+
+        builder.Property(x => x.TemplateCode).IsRequired().HasMaxLength(50);
+        builder.HasIndex(x => x.TemplateCode).IsUnique();
+        builder.Property(x => x.TemplateName).IsRequired().HasMaxLength(200);
+        builder.Property(x => x.Description).HasMaxLength(1000);
+        builder.Property(x => x.Status)
+            .HasConversion<string>().HasMaxLength(20).IsRequired()
+            .HasDefaultValue(EntityStatus.Active);
+        builder.Property(x => x.CreatedAt).IsRequired();
+        builder.Property(x => x.ConcurrencyStamp)
+            .IsRequired()
+            .HasColumnType("integer")
+            .HasDefaultValue(0)
+            .IsConcurrencyToken();
+
+        builder.HasMany(x => x.Lines)
+            .WithOne(x => x.BundleSaleTemplate)
+            .HasForeignKey(x => x.BundleSaleTemplateId)
+            .OnDelete(DeleteBehavior.Cascade);
+    }
+}
diff --git a/Backend/ERPCore/Infra/Persistence/Configurations/BundleSaleTemplateLineConfiguration.cs b/Backend/ERPCore/Infra/Persistence/Configurations/BundleSaleTemplateLineConfiguration.cs
new file mode 100644
index 0000000..113647e
--- /dev/null
+++ b/Backend/ERPCore/Infra/Persistence/Configurations/BundleSaleTemplateLineConfiguration.cs
@@ -0,0 +1,21 @@
+using ERPCore.Domain.Entities;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace ERPCore.Infra.Persistence.Configurations;
+
+public sealed class BundleSaleTemplateLineConfiguration : IEntityTypeConfiguration<BundleSaleTemplateLine>
+{
+    public void Configure(EntityTypeBuilder<BundleSaleTemplateLine> builder)
+    {
+        builder.ToTable("bundle_sale_template_lines");
+        builder.HasKey(x => x.BundleSaleTemplateLineId);
+        builder.Property(x => x.Qty).HasPrecision(18, 4);
+        builder.Property(x => x.UnitPrice).HasPrecision(18, 4);
+        builder.Property(x => x.SortOrder).HasDefaultValue(0);
+
+        builder.HasOne(x => x.Item).WithMany().HasForeignKey(x => x.ItemId).OnDelete(DeleteBehavior.Restrict);
+        builder.HasOne(x => x.Uom).WithMany().HasForeignKey(x => x.UomId).OnDelete(DeleteBehavior.Restrict);
+        builder.HasOne(x => x.Warehouse).WithMany().HasForeignKey(x => x.WarehouseId).OnDelete(DeleteBehavior.Restrict);
+    }
+}
diff --git a/Backend/ERPCore/Infra/Persistence/Configurations/CustomerConfiguration.cs b/Backend/ERPCore/Infra/Persistence/Configurations/CustomerConfiguration.cs
new file mode 100644
index 0000000..a52b327
--- /dev/null
+++ b/Backend/ERPCore/Infra/Persistence/Configurations/CustomerConfiguration.cs
@@ -0,0 +1,50 @@
+using ERPCore.Domain.Entities;
+using ERPCore.Domain.Enums;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace ERPCore.Infra.Persistence.Configurations;
+
+public sealed class CustomerConfiguration : IEntityTypeConfiguration<Customer>
+{
+    public void Configure(EntityTypeBuilder<Customer> builder)
+    {
+        builder.ToTable("customers");
+        builder.HasKey(c => c.CustomerId);
+
+        builder.Property(c => c.CustomerCode).IsRequired().HasMaxLength(50);
+        builder.HasIndex(c => c.CustomerCode).IsUnique();
+
+        builder.Property(c => c.CustomerType)
+            .HasConversion<string>().HasMaxLength(20).IsRequired()
+            .HasDefaultValue(CustomerType.B2C);
+
+        builder.Property(c => c.Name).IsRequired().HasMaxLength(200);
+        builder.Property(c => c.DisplayName).HasMaxLength(200);
+        builder.Property(c => c.Phone).HasMaxLength(30);
+        builder.Property(c => c.Email).HasMaxLength(100);
+        builder.Property(c => c.AddressLine1).HasMaxLength(250);
+        builder.Property(c => c.AddressLine2).HasMaxLength(250);
+        builder.Property(c => c.City).HasMaxLength(100);
+        builder.Property(c => c.Country).HasMaxLength(100);
+        builder.Property(c => c.TaxRegistrationNo).HasMaxLength(50);
+
+        builder.Property(c => c.CreditLimit).HasPrecision(18, 4);
+        builder.Property(c => c.CreditDays).IsRequired();
+
+        builder.HasOne(c => c.DefaultWarehouse)
+            .WithMany()
+            .HasForeignKey(c => c.DefaultWarehouseId)
+            .OnDelete(DeleteBehavior.SetNull);
+
+        builder.Property(c => c.Status)
+            .HasConversion<string>().HasMaxLength(20).IsRequired()
+            .HasDefaultValue(EntityStatus.Active);
+
+        builder.Property(c => c.CreatedAt).IsRequired();
+        builder.Property(c => c.RowVersion).IsRowVersion();
+
+        builder.HasIndex(c => c.Status);
+        builder.HasIndex(c => c.CustomerType);
+    }
+}
diff --git a/Backend/ERPCore/Infra/Persistence/Configurations/NavItemConfiguration.cs b/Backend/ERPCore/Infra/Persistence/Configurations/NavItemConfiguration.cs
index 0a89d0a..afc2771 100644
--- a/Backend/ERPCore/Infra/Persistence/Configurations/NavItemConfiguration.cs
+++ b/Backend/ERPCore/Infra/Persistence/Configurations/NavItemConfiguration.cs
@@ -36,7 +36,10 @@ public sealed class NavItemConfiguration : IEntityTypeConfiguration<NavItem>
             new NavItem { NavItemId = 7, Code = "warehouses", Label = "Warehouses", Href = "/dashboard/warehouse", SortOrder = 7 },
             new NavItem { NavItemId = 8, Code = "orders", Label = "Orders", Href = "/dashboard/orders", SortOrder = 8 },
             new NavItem { NavItemId = 9, Code = "settings", Label = "Settings", Href = "/dashboard/settings", SortOrder = 9 },
-            new NavItem { NavItemId = 10, Code = "help", Label = "Help", Href = "/dashboard/help", SortOrder = 10 }
+            new NavItem { NavItemId = 10, Code = "help", Label = "Help", Href = "/dashboard/help", SortOrder = 10 },
+            new NavItem { NavItemId = 11, Code = "ledgers", Label = "Ledgers", Href = "/dashboard/ledgers", SortOrder = 11 },
+            new NavItem { NavItemId = 12, Code = "accounts", Label = "Accounts", Href = "/dashboard/accounts", SortOrder = 12 },
+            new NavItem { NavItemId = 13, Code = "sales", Label = "Sales", Href = "/dashboard/sales", SortOrder = 13 }
         );
     }
 }
diff --git a/Backend/ERPCore/Infra/Persistence/Configurations/PermissionConfiguration.cs b/Backend/ERPCore/Infra/Persistence/Configurations/PermissionConfiguration.cs
index 065f5b8..47bec28 100644
--- a/Backend/ERPCore/Infra/Persistence/Configurations/PermissionConfiguration.cs
+++ b/Backend/ERPCore/Infra/Persistence/Configurations/PermissionConfiguration.cs
@@ -42,10 +42,26 @@ public sealed class PermissionConfiguration : IEntityTypeConfiguration<Permissio
             new Permission { PermissionId = 16, Code = "NAV:products.configuration", SubNavItemId = 6 },
             new Permission { PermissionId = 17, Code = "NAV:settings.roles", SubNavItemId = 7 },
             new Permission { PermissionId = 18, Code = "NAV:settings.users", SubNavItemId = 8 },
-            new Permission { PermissionId = 19, Code = "NAV:procurement.requisitions", SubNavItemId = 9 },
-            new Permission { PermissionId = 20, Code = "NAV:procurement.rfqs", SubNavItemId = 10 },
-            new Permission { PermissionId = 21, Code = "NAV:procurement.purchase-orders", SubNavItemId = 11 },
-            new Permission { PermissionId = 22, Code = "NAV:procurement.purchase-returns", SubNavItemId = 12 }
+            // IDs 28-31 (not 19-22): 19-22 were already claimed by the Ledgers permissions below;
+            // these procurement rows were never actually migrated into the database before now.
+            new Permission { PermissionId = 28, Code = "NAV:procurement.requisitions", SubNavItemId = 17 },
+            new Permission { PermissionId = 29, Code = "NAV:procurement.rfqs", SubNavItemId = 18 },
+            new Permission { PermissionId = 30, Code = "NAV:procurement.purchase-orders", SubNavItemId = 19 },
+            new Permission { PermissionId = 31, Code = "NAV:procurement.purchase-returns", SubNavItemId = 20 },
+            new Permission { PermissionId = 19, Code = "NAV:ledgers", NavItemId = 11 },
+            new Permission { PermissionId = 20, Code = "NAV:ledgers.trial-balance", SubNavItemId = 9 },
+            new Permission { PermissionId = 21, Code = "NAV:ledgers.balance-sheet", SubNavItemId = 10 },
+            new Permission { PermissionId = 22, Code = "NAV:ledgers.general-ledger", SubNavItemId = 11 },
+            new Permission { PermissionId = 23, Code = "NAV:ledgers.profit-and-loss", SubNavItemId = 12 },
+            new Permission { PermissionId = 24, Code = "NAV:ledgers.cash-flow", SubNavItemId = 13 },
+            new Permission { PermissionId = 25, Code = "NAV:ledgers.budget-vs-actual", SubNavItemId = 14 },
+            new Permission { PermissionId = 27, Code = "NAV:ledgers.tax-report", SubNavItemId = 16 },
+            // Moved under the new Accounts nav item (2026-07-31) — same PermissionId (26), just a
+            // renamed Code, so any role already granted this permission keeps it.
+            new Permission { PermissionId = 26, Code = "NAV:accounts.bank-accounts", SubNavItemId = 15 },
+            new Permission { PermissionId = 32, Code = "NAV:accounts", NavItemId = 12 },
+            new Permission { PermissionId = 33, Code = "NAV:accounts.cheque-books", SubNavItemId = 21 },
+            new Permission { PermissionId = 34, Code = "NAV:accounts.received-cheques", SubNavItemId = 22 }
         );
     }
 }
diff --git a/Backend/ERPCore/Infra/Persistence/Configurations/SalesInvoiceConfiguration.cs b/Backend/ERPCore/Infra/Persistence/Configurations/SalesInvoiceConfiguration.cs
new file mode 100644
index 0000000..e8f27ed
--- /dev/null
+++ b/Backend/ERPCore/Infra/Persistence/Configurations/SalesInvoiceConfiguration.cs
@@ -0,0 +1,95 @@
+using ERPCore.Domain.Entities;
+using ERPCore.Domain.Enums;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace ERPCore.Infra.Persistence.Configurations;
+
+public sealed class SalesInvoiceConfiguration : IEntityTypeConfiguration<SalesInvoice>
+{
+    public void Configure(EntityTypeBuilder<SalesInvoice> builder)
+    {
+        builder.ToTable("sales_invoices");
+        builder.HasKey(x => x.SalesInvoiceId);
+
+        builder.Property(x => x.InvoiceNo).IsRequired().HasMaxLength(50);
+        builder.HasIndex(x => x.InvoiceNo).IsUnique();
+
+        builder.Property(x => x.InvoiceDate).IsRequired();
+
+        builder.HasOne(x => x.Customer)
+            .WithMany()
+            .HasForeignKey(x => x.CustomerId)
+            .OnDelete(DeleteBehavior.Restrict);
+
+        builder.Property(x => x.CustomerSnapshotName).IsRequired().HasMaxLength(200);
+        builder.Property(x => x.CustomerSnapshotTaxNo).HasMaxLength(50);
+
+        builder.HasOne(x => x.Warehouse)
+            .WithMany()
+            .HasForeignKey(x => x.WarehouseId)
+            .OnDelete(DeleteBehavior.Restrict);
+
+        builder.Property(x => x.InvoiceType)
+            .HasConversion<string>().HasMaxLength(20).IsRequired()
+            .HasDefaultValue(SalesInvoiceType.B2C);
+
+        builder.Property(x => x.Status)
+            .HasConversion<string>().HasMaxLength(20).IsRequired()
+            .HasDefaultValue(SalesInvoiceStatus.Draft);
+
+        foreach (var p in new[] { nameof(SalesInvoice.Subtotal), nameof(SalesInvoice.DiscountTotal), nameof(SalesInvoice.TaxTotal), nameof(SalesInvoice.GrandTotal), nameof(SalesInvoice.RoundOff), nameof(SalesInvoice.NetPayable), nameof(SalesInvoice.PaidAmount), nameof(SalesInvoice.BalanceAmount) })
+            builder.Property<decimal>(p).HasPrecision(18, 4);
+
+        builder.Property(x => x.CreatedAt).IsRequired();
+        builder.Property(x => x.RowVersion).IsRowVersion();
+
+        builder.HasIndex(x => x.Status);
+        builder.HasIndex(x => x.InvoiceDate);
+
+        builder.HasMany(x => x.Lines)
+            .WithOne(x => x.SalesInvoice)
+            .HasForeignKey(x => x.SalesInvoiceId)
+            .OnDelete(DeleteBehavior.Cascade);
+    }
+}
+
+public sealed class SalesInvoiceLineConfiguration : IEntityTypeConfiguration<SalesInvoiceLine>
+{
+    public void Configure(EntityTypeBuilder<SalesInvoiceLine> builder)
+    {
+        builder.ToTable("sales_invoice_lines");
+        builder.HasKey(x => x.SalesInvoiceLineId);
+
+        builder.HasOne(x => x.Item)
+            .WithMany()
+            .HasForeignKey(x => x.ItemId)
+            .OnDelete(DeleteBehavior.Restrict);
+
+        builder.Property(x => x.Description).IsRequired().HasMaxLength(200);
+
+        builder.Property(x => x.Qty).HasPrecision(18, 4);
+        builder.Property(x => x.FreeQty).HasPrecision(18, 4);
+        builder.Property(x => x.UnitPrice).HasPrecision(18, 4);
+        builder.Property(x => x.BaseCost).HasPrecision(18, 4);
+        builder.Property(x => x.DiscountPct).HasPrecision(9, 4);
+        builder.Property(x => x.DiscountAmount).HasPrecision(18, 4);
+        builder.Property(x => x.NetUnitPrice).HasPrecision(18, 4);
+        builder.Property(x => x.LineTotal).HasPrecision(18, 4);
+        builder.Property(x => x.TaxPct).HasPrecision(9, 4);
+        builder.Property(x => x.TaxAmount).HasPrecision(18, 4);
+
+        builder.HasOne(x => x.Uom)
+            .WithMany()
+            .HasForeignKey(x => x.UomId)
+            .OnDelete(DeleteBehavior.Restrict);
+
+        builder.HasOne(x => x.Warehouse)
+            .WithMany()
+            .HasForeignKey(x => x.WarehouseId)
+            .OnDelete(DeleteBehavior.Restrict);
+
+        builder.Property(x => x.PriceSource).HasMaxLength(50);
+        builder.Property(x => x.RowVersion).IsRowVersion();
+    }
+}
diff --git a/Backend/ERPCore/Infra/Persistence/Configurations/SalesSlipConfiguration.cs b/Backend/ERPCore/Infra/Persistence/Configurations/SalesSlipConfiguration.cs
new file mode 100644
index 0000000..deeeed0
--- /dev/null
+++ b/Backend/ERPCore/Infra/Persistence/Configurations/SalesSlipConfiguration.cs
@@ -0,0 +1,95 @@
+using ERPCore.Domain.Entities;
+using ERPCore.Domain.Enums;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace ERPCore.Infra.Persistence.Configurations;
+
+public sealed class SalesSlipConfiguration : IEntityTypeConfiguration<SalesSlip>
+{
+    public void Configure(EntityTypeBuilder<SalesSlip> builder)
+    {
+        builder.ToTable("sales_slips");
+        builder.HasKey(x => x.SalesSlipId);
+
+        builder.Property(x => x.SlipNo).IsRequired().HasMaxLength(50);
+        builder.HasIndex(x => x.SlipNo).IsUnique();
+
+        builder.Property(x => x.SlipDate).IsRequired();
+
+        builder.HasOne(x => x.Customer)
+            .WithMany()
+            .HasForeignKey(x => x.CustomerId)
+            .OnDelete(DeleteBehavior.Restrict);
+
+        builder.Property(x => x.CustomerSnapshotName).IsRequired().HasMaxLength(200);
+
+        builder.HasOne(x => x.Warehouse)
+            .WithMany()
+            .HasForeignKey(x => x.WarehouseId)
+            .OnDelete(DeleteBehavior.Restrict);
+
+        builder.HasOne(x => x.CashierUser)
+            .WithMany()
+            .HasForeignKey(x => x.CashierUserId)
+            .OnDelete(DeleteBehavior.Restrict);
+
+        builder.Property(x => x.Status)
+            .HasConversion<string>().HasMaxLength(20).IsRequired()
+            .HasDefaultValue(SalesSlipStatus.Draft);
+
+        foreach (var p in new[] { nameof(SalesSlip.Subtotal), nameof(SalesSlip.DiscountTotal), nameof(SalesSlip.TaxTotal), nameof(SalesSlip.GrandTotal), nameof(SalesSlip.PaidAmount), nameof(SalesSlip.BalanceAmount) })
+            builder.Property<decimal>(p).HasPrecision(18, 4);
+
+        builder.Property(x => x.CreatedAt).IsRequired();
+        builder.Property(x => x.RowVersion).IsRowVersion();
+
+        builder.HasIndex(x => x.Status);
+        builder.HasIndex(x => x.SlipDate);
+
+        builder.HasMany(x => x.Lines)
+            .WithOne(x => x.SalesSlip)
+            .HasForeignKey(x => x.SalesSlipId)
+            .OnDelete(DeleteBehavior.Cascade);
+    }
+}
+
+public sealed class SalesSlipLineConfiguration : IEntityTypeConfiguration<SalesSlipLine>
+{
+    public void Configure(EntityTypeBuilder<SalesSlipLine> builder)
+    {
+        builder.ToTable("sales_slip_lines");
+        builder.HasKey(x => x.SalesSlipLineId);
+
+        builder.HasOne(x => x.Item)
+            .WithMany()
+            .HasForeignKey(x => x.ItemId)
+            .OnDelete(DeleteBehavior.Restrict);
+
+        builder.Property(x => x.Description).IsRequired().HasMaxLength(200);
+
+        builder.Property(x => x.Qty).HasPrecision(18, 4);
+        builder.Property(x => x.FreeQty).HasPrecision(18, 4);
+        builder.Property(x => x.UnitPrice).HasPrecision(18, 4);
+        builder.Property(x => x.BaseCost).HasPrecision(18, 4);
+        builder.Property(x => x.DiscountPct).HasPrecision(9, 4);
+        builder.Property(x => x.DiscountAmount).HasPrecision(18, 4);
+        builder.Property(x => x.NetUnitPrice).HasPrecision(18, 4);
+        builder.Property(x => x.LineTotal).HasPrecision(18, 4);
+        builder.Property(x => x.TaxPct).HasPrecision(9, 4);
+        builder.Property(x => x.TaxAmount).HasPrecision(18, 4);
+
+        builder.HasOne(x => x.Uom)
+            .WithMany()
+            .HasForeignKey(x => x.UomId)
+            .OnDelete(DeleteBehavior.Restrict);
+
+        builder.HasOne(x => x.Warehouse)
+            .WithMany()
+            .HasForeignKey(x => x.WarehouseId)
+            .OnDelete(DeleteBehavior.Restrict);
+
+        builder.Property(x => x.PriceSource).HasMaxLength(50);
+        builder.Property(x => x.RowVersion).IsRowVersion();
+    }
+}
diff --git a/Backend/ERPCore/Infra/Persistence/Configurations/SubNavItemConfiguration.cs b/Backend/ERPCore/Infra/Persistence/Configurations/SubNavItemConfiguration.cs
index eb4f156..4282211 100644
--- a/Backend/ERPCore/Infra/Persistence/Configurations/SubNavItemConfiguration.cs
+++ b/Backend/ERPCore/Infra/Persistence/Configurations/SubNavItemConfiguration.cs
@@ -33,11 +33,27 @@ public sealed class SubNavItemConfiguration : IEntityTypeConfiguration<SubNavIte
             new SubNavItem { SubNavItemId = 6, NavItemId = 2, Code = "products.configuration", Label = "Configuration", Href = "/dashboard/products/settings", SortOrder = 6 },
             new SubNavItem { SubNavItemId = 7, NavItemId = 9, Code = "settings.roles", Label = "Roles", Href = "/dashboard/settings/roles", SortOrder = 1 },
             new SubNavItem { SubNavItemId = 8, NavItemId = 9, Code = "settings.users", Label = "Users", Href = "/dashboard/settings/users", SortOrder = 2 },
+            new SubNavItem { SubNavItemId = 23, NavItemId = 13, Code = "sales.bundle-sales", Label = "Bundle Sales", Href = "/dashboard/sales/bundles", SortOrder = 1 },
             // Procurement (NavItemId 4) children — mirror the hub page order.
-            new SubNavItem { SubNavItemId = 9, NavItemId = 4, Code = "procurement.requisitions", Label = "Requisitions", Href = "/dashboard/procurement/requisitions", SortOrder = 1 },
-            new SubNavItem { SubNavItemId = 10, NavItemId = 4, Code = "procurement.rfqs", Label = "RFQs", Href = "/dashboard/procurement/rfqs", SortOrder = 2 },
-            new SubNavItem { SubNavItemId = 11, NavItemId = 4, Code = "procurement.purchase-orders", Label = "Purchase Orders", Href = "/dashboard/procurement/purchase-orders", SortOrder = 3 },
-            new SubNavItem { SubNavItemId = 12, NavItemId = 4, Code = "procurement.purchase-returns", Label = "Purchase Returns", Href = "/dashboard/procurement/purchase-returns", SortOrder = 4 }
+            // IDs 17-20 (not 9-12): 9-12 were already claimed by the Ledgers sub-items below;
+            // these procurement rows were never actually migrated into the database before now.
+            new SubNavItem { SubNavItemId = 17, NavItemId = 4, Code = "procurement.requisitions", Label = "Requisitions", Href = "/dashboard/procurement/requisitions", SortOrder = 1 },
+            new SubNavItem { SubNavItemId = 18, NavItemId = 4, Code = "procurement.rfqs", Label = "RFQs", Href = "/dashboard/procurement/rfqs", SortOrder = 2 },
+            new SubNavItem { SubNavItemId = 19, NavItemId = 4, Code = "procurement.purchase-orders", Label = "Purchase Orders", Href = "/dashboard/procurement/purchase-orders", SortOrder = 3 },
+            new SubNavItem { SubNavItemId = 20, NavItemId = 4, Code = "procurement.purchase-returns", Label = "Purchase Returns", Href = "/dashboard/procurement/purchase-returns", SortOrder = 4 },
+            new SubNavItem { SubNavItemId = 9, NavItemId = 11, Code = "ledgers.trial-balance", Label = "Trial Balance", Href = "/dashboard/ledgers/trial-balance", SortOrder = 1 },
+            new SubNavItem { SubNavItemId = 10, NavItemId = 11, Code = "ledgers.balance-sheet", Label = "Balance Sheet", Href = "/dashboard/ledgers/balance-sheet", SortOrder = 2 },
+            new SubNavItem { SubNavItemId = 11, NavItemId = 11, Code = "ledgers.general-ledger", Label = "General Ledger", Href = "/dashboard/ledgers/general-ledger", SortOrder = 3 },
+            new SubNavItem { SubNavItemId = 12, NavItemId = 11, Code = "ledgers.profit-and-loss", Label = "Profit & Loss", Href = "/dashboard/ledgers/profit-and-loss", SortOrder = 4 },
+            new SubNavItem { SubNavItemId = 13, NavItemId = 11, Code = "ledgers.cash-flow", Label = "Cash Flow", Href = "/dashboard/ledgers/cash-flow", SortOrder = 5 },
+            new SubNavItem { SubNavItemId = 14, NavItemId = 11, Code = "ledgers.budget-vs-actual", Label = "Budget vs Actual", Href = "/dashboard/ledgers/budget-vs-actual", SortOrder = 6 },
+            new SubNavItem { SubNavItemId = 16, NavItemId = 11, Code = "ledgers.tax-report", Label = "Tax Report", Href = "/dashboard/ledgers/tax-report", SortOrder = 7 },
+            // Moved under the new Accounts nav item (2026-07-31) — kept the same SubNavItemId (15)
+            // rather than delete+recreate, so any role that already had this permission granted
+            // doesn't silently lose it just because the section it lives under changed.
+            new SubNavItem { SubNavItemId = 15, NavItemId = 12, Code = "accounts.bank-accounts", Label = "Cash / Bank Accounts", Href = "/dashboard/accounts/bank-accounts", SortOrder = 1 },
+            new SubNavItem { SubNavItemId = 21, NavItemId = 12, Code = "accounts.cheque-books", Label = "Cheque Books", Href = "/dashboard/accounts/cheque-books", SortOrder = 2 },
+            new SubNavItem { SubNavItemId = 22, NavItemId = 12, Code = "accounts.received-cheques", Label = "Received Cheques", Href = "/dashboard/accounts/received-cheques", SortOrder = 3 }
         );
     }
 }
diff --git a/Backend/ERPCore/Infra/Persistence/DataSeeder.cs b/Backend/ERPCore/Infra/Persistence/DataSeeder.cs
index 8972da9..08dc206 100644
--- a/Backend/ERPCore/Infra/Persistence/DataSeeder.cs
+++ b/Backend/ERPCore/Infra/Persistence/DataSeeder.cs
@@ -1,4 +1,5 @@
 using ERPCore.Domain.Entities;
+using ERPCore.Domain;
 using ERPCore.Domain.Enums;
 using Microsoft.EntityFrameworkCore;
 
@@ -42,7 +43,11 @@ public static class DataSeeder
     {
         var dirty = await SeedReasonCodesAsync(db, ct);
         dirty |= await SeedItemTypesAsync(db, ct);
+       // dirty |= await SeedCompanyProfileAsync(db, ct);
         dirty |= await SeedProductConfigAsync(db, ct);
+        dirty |= await SeedSalesMastersAsync(db, ct);
+        dirty |= await SeedSalesStockAsync(db, ct);
+        dirty |= await SeedSalesAsync(db, ct);
 
         if (dirty) await db.SaveChangesAsync(ct);
     }
@@ -99,4 +104,754 @@ public static class DataSeeder
         });
         return true;
     }
+
+    /// <summary>
+    /// Seeds a printable company profile with reasonable defaults for invoice headers.
+    /// These values are intentionally editable later through the API.
+    /// </summary>
+    //private static async Task<bool> SeedCompanyProfileAsync(ErpDbContext db, CancellationToken ct)
+    //{
+    //    if (await db.CompanyProfiles.AnyAsync(c => c.CompanyProfileId == CompanyProfile.SingletonId, ct)) return false;
+
+    //    db.CompanyProfiles.Add(new CompanyProfile
+    //    {
+    //        CompanyProfileId = CompanyProfile.SingletonId,
+    //        LegalName = "ERP Core Trading (Pvt) Ltd",
+    //        TradeName = "ERP Core Trading",
+    //        TaxRegistrationNo = "TAX-DEFAULT-001",
+    //        VatRegistrationNo = "VAT-DEFAULT-001",
+    //        AddressLine1 = "1 Demo Street",
+    //        City = "Colombo",
+    //        Country = "Sri Lanka",
+    //        Phone = "+94 11 000 0000",
+    //        Email = "accounts@example.com",
+    //        BankName = "Demo Bank",
+    //        BankBranch = "Colombo Main",
+    //        AccountName = "ERP Core Trading (Pvt) Ltd",
+    //        AccountNumber = "000123456789",
+    //        SwiftCode = "DEMO1234",
+    //        FooterNote = "Thank you for your business."
+    //    });
+    //    return true;
+    //}
+
+    /// <summary>
+    /// Seeds the minimum catalog data required for the sales demo rows to exist.
+    /// These are safe additive rows and do not alter any existing data.
+    /// </summary>
+    private static async Task<bool> SeedSalesMastersAsync(ErpDbContext db, CancellationToken ct)
+    {
+        var dirty = false;
+
+        dirty |= await SeedWarehousesAsync(db, ct);
+        dirty |= await SeedUomsAsync(db, ct);
+        dirty |= await SeedCategoriesAsync(db, ct);
+        dirty |= await SeedItemsAsync(db, ct);
+
+        return dirty;
+    }
+
+    /// <summary>
+    /// Seeds a simple on-hand FIFO layer for the demo sales item so the sample
+    /// invoices can be posted without immediately failing stock validation.
+    /// This keeps the stock-check and posting flows testable on a fresh database.
+    /// </summary>
+    private static async Task<bool> SeedSalesStockAsync(ErpDbContext db, CancellationToken ct)
+    {
+        var warehouse = await db.Warehouses.AsNoTracking()
+            .OrderBy(w => w.WarehouseId)
+            .FirstOrDefaultAsync(ct);
+        var item = await db.Items.AsNoTracking()
+            .OrderBy(i => i.ItemId)
+            .FirstOrDefaultAsync(ct);
+        var secondItem = await db.Items.AsNoTracking()
+            .OrderByDescending(i => i.ItemId)
+            .FirstOrDefaultAsync(ct);
+
+        if (warehouse is null || item is null || secondItem is null)
+            return false;
+
+        var existing = await db.StockLayers.AnyAsync(
+            l => (l.ItemId == item.ItemId || l.ItemId == secondItem.ItemId) && l.WarehouseId == warehouse.WarehouseId && l.QtyRemaining > 0m,
+            ct);
+        if (existing) return false;
+
+        db.StockLayers.Add(new StockLayer
+        {
+            ItemId = item.ItemId,
+            WarehouseId = warehouse.WarehouseId,
+            QtyReceived = 100m,
+            QtyRemaining = 100m,
+            UnitCost = item.SalePrice.GetValueOrDefault() > 0m ? item.SalePrice.GetValueOrDefault() / 2m : 25m,
+            ReceiptDate = DateTime.UtcNow.AddDays(-7)
+        });
+        db.StockLayers.Add(new StockLayer
+        {
+            ItemId = secondItem.ItemId,
+            WarehouseId = warehouse.WarehouseId,
+            QtyReceived = 5m,
+            QtyRemaining = 5m,
+            UnitCost = secondItem.SalePrice.GetValueOrDefault() > 0m ? secondItem.SalePrice.GetValueOrDefault() / 2m : 15m,
+            ReceiptDate = DateTime.UtcNow.AddDays(-6)
+        });
+        return true;
+    }
+
+    private static async Task<bool> SeedWarehousesAsync(ErpDbContext db, CancellationToken ct)
+    {
+        var existingCodes = await db.Warehouses.Select(w => w.Code).ToListAsync(ct);
+        var have = existingCodes.ToHashSet(StringComparer.OrdinalIgnoreCase);
+
+        var seeds = new[]
+        {
+            new Warehouse { Code = "MAIN", Name = "Main Warehouse" },
+            new Warehouse { Code = "SHOP", Name = "Sales Counter" }
+        };
+
+        var toAdd = seeds.Where(w => !have.Contains(w.Code)).ToList();
+        if (toAdd.Count == 0) return false;
+
+        db.Warehouses.AddRange(toAdd);
+        return true;
+    }
+
+    private static async Task<bool> SeedUomsAsync(ErpDbContext db, CancellationToken ct)
+    {
+        var existingNames = await db.Uoms.Select(u => u.Name).ToListAsync(ct);
+        var have = existingNames.ToHashSet(StringComparer.OrdinalIgnoreCase);
+
+        var seeds = new[]
+        {
+            new Uom { Name = "PCS" },
+            new Uom { Name = "BOX" }
+        };
+
+        var toAdd = seeds.Where(u => !have.Contains(u.Name)).ToList();
+        if (toAdd.Count == 0) return false;
+
+        db.Uoms.AddRange(toAdd);
+        return true;
+    }
+
+    private static async Task<bool> SeedCategoriesAsync(ErpDbContext db, CancellationToken ct)
+    {
+        var existingNames = await db.Categories.Select(c => c.Name).ToListAsync(ct);
+        var have = existingNames.ToHashSet(StringComparer.OrdinalIgnoreCase);
+
+        var seeds = new[]
+        {
+            new Category { Name = "General Goods", Status = EntityStatus.Active, CreatedAt = DateTime.UtcNow },
+            new Category { Name = "Accessories", Status = EntityStatus.Active, CreatedAt = DateTime.UtcNow }
+        };
+
+        var toAdd = seeds.Where(c => !have.Contains(c.Name)).ToList();
+        if (toAdd.Count == 0) return false;
+
+        db.Categories.AddRange(toAdd);
+        return true;
+    }
+
+    private static async Task<bool> SeedItemsAsync(ErpDbContext db, CancellationToken ct)
+    {
+        var existingSkus = await db.Items.Select(i => i.Sku).ToListAsync(ct);
+        var have = existingSkus.ToHashSet(StringComparer.OrdinalIgnoreCase);
+
+        var category = await db.Categories.AsNoTracking()
+            .OrderBy(c => c.CategoryId)
+            .FirstOrDefaultAsync(ct);
+        var uom = await db.Uoms.AsNoTracking()
+            .OrderBy(u => u.UomId)
+            .FirstOrDefaultAsync(ct);
+
+        if (category is null || uom is null)
+            return false;
+
+        var now = DateTime.UtcNow;
+        var seeds = new[]
+        {
+            new Item
+            {
+                Sku = "SKU-DEMO-001",
+                Name = "Demo Item 1",
+                Description = "Seeded sample item for sales documents",
+                CategoryId = category.CategoryId,
+                BaseUomId = uom.UomId,
+                StockNature = StockNature.Stocked,
+                TrackingMode = TrackingMode.None,
+                SalePrice = 100m,
+                Status = EntityStatus.Active,
+                CreatedAt = now
+            },
+            new Item
+            {
+                Sku = "SKU-DEMO-002",
+                Name = "Demo Item 2",
+                Description = "Secondary seeded sample item for sales documents",
+                CategoryId = category.CategoryId,
+                BaseUomId = uom.UomId,
+                StockNature = StockNature.Stocked,
+                TrackingMode = TrackingMode.None,
+                SalePrice = 50m,
+                Status = EntityStatus.Active,
+                CreatedAt = now
+            }
+        };
+
+        var toAdd = seeds.Where(i => !have.Contains(i.Sku)).ToList();
+        if (toAdd.Count == 0) return false;
+
+        db.Items.AddRange(toAdd);
+        return true;
+    }
+
+    /// <summary>
+    /// Seeds the minimum sales bootstrap data needed for UI/backend development:
+    /// a couple of customer rows, current-year document counters, and a few draft
+    /// invoice/slip samples when the required master data already exists.
+    /// This intentionally never clears or rewrites any existing rows.
+    /// </summary>
+    private static async Task<bool> SeedSalesAsync(ErpDbContext db, CancellationToken ct)
+    {
+        var dirty = false;
+
+        dirty |= await SeedSalesCustomersAsync(db, ct);
+        dirty |= await SeedSalesSequencesAsync(db, ct);
+        dirty |= await SeedSampleSalesDocsAsync(db, ct);
+
+        try
+        {
+            dirty |= await SeedBundleSalesAsync(db, ct);
+        }
+        catch
+        {
+            // Bundle demo data is best-effort only; never block startup because of seed drift.
+        }
+
+        return dirty;
+    }
+
+    private static async Task<bool> SeedSalesCustomersAsync(ErpDbContext db, CancellationToken ct)
+    {
+        var existingCodes = await db.Customers.Select(c => c.CustomerCode).ToListAsync(ct);
+        var have = existingCodes.ToHashSet(StringComparer.OrdinalIgnoreCase);
+
+        var seeds = new[]
+        {
+            new Customer
+            {
+                CustomerCode = "CUST-WALKIN",
+                CustomerType = CustomerType.B2C,
+                Name = "Walk-in Customer",
+                DisplayName = "Walk-in Customer",
+                CreditLimit = 0m,
+                CreditDays = 0,
+                Status = EntityStatus.Active,
+                CreatedAt = DateTime.UtcNow
+            },
+            new Customer
+            {
+                CustomerCode = "CUST-DEMO",
+                CustomerType = CustomerType.B2B,
+                Name = "Demo Retail Ltd",
+                DisplayName = "Demo Retail Ltd",
+                Phone = "+94 11 000 0000",
+                Email = "sales@example.com",
+                AddressLine1 = "1 Demo Street",
+                City = "Colombo",
+                Country = "Sri Lanka",
+                TaxRegistrationNo = "VAT-DEMO-001",
+                CreditLimit = 250000m,
+                CreditDays = 30,
+                Status = EntityStatus.Active,
+                CreatedAt = DateTime.UtcNow
+            }
+        };
+
+        var toAdd = seeds.Where(c => !have.Contains(c.CustomerCode)).ToList();
+        if (toAdd.Count == 0) return false;
+
+        db.Customers.AddRange(toAdd);
+        return true;
+    }
+
+    private static async Task<bool> SeedSalesSequencesAsync(ErpDbContext db, CancellationToken ct)
+    {
+        var year = DateTime.UtcNow.Year;
+        var existing = await db.NumberSequences
+            .Where(s => s.Year == year && (s.DocType == DocumentTypes.SalesInvoice || s.DocType == DocumentTypes.SalesSlip || s.DocType == DocumentTypes.BundleSale))
+            .Select(s => s.DocType)
+            .ToListAsync(ct);
+        var have = existing.ToHashSet(StringComparer.OrdinalIgnoreCase);
+
+        var seeds = new[]
+        {
+            new NumberSequence { DocType = DocumentTypes.SalesInvoice, Year = year, LastNumber = 0 },
+            new NumberSequence { DocType = DocumentTypes.SalesSlip, Year = year, LastNumber = 0 },
+            new NumberSequence { DocType = DocumentTypes.BundleSale, Year = year, LastNumber = 0 }
+        };
+
+        var toAdd = seeds.Where(s => !have.Contains(s.DocType)).ToList();
+        if (toAdd.Count == 0) return false;
+
+        db.NumberSequences.AddRange(toAdd);
+        return true;
+    }
+
+    private static async Task<bool> SeedBundleSalesAsync(ErpDbContext db, CancellationToken ct)
+    {
+        if (await db.BundleSaleTemplates.AnyAsync(ct) || await db.BundleSales.AnyAsync(ct))
+            return false;
+
+        var customer = await db.Customers.AsNoTracking()
+            .OrderBy(c => c.CustomerId)
+            .FirstOrDefaultAsync(ct);
+        var warehouse = await db.Warehouses.AsNoTracking()
+            .OrderBy(w => w.WarehouseId)
+            .FirstOrDefaultAsync(ct);
+        var secondaryWarehouse = await db.Warehouses.AsNoTracking()
+            .OrderByDescending(w => w.WarehouseId)
+            .FirstOrDefaultAsync(ct);
+        var items = await db.Items.AsNoTracking()
+            .OrderBy(i => i.ItemId)
+            .Take(2)
+            .ToListAsync(ct);
+        var uom = await db.Uoms.AsNoTracking()
+            .OrderBy(u => u.UomId)
+            .FirstOrDefaultAsync(ct);
+        var user = await db.Users.AsNoTracking()
+            .OrderBy(u => u.UserId)
+            .FirstOrDefaultAsync(ct);
+
+        if (customer is null || warehouse is null || secondaryWarehouse is null || items.Count < 2 || uom is null || user is null)
+            return false;
+
+        var now = DateTime.UtcNow;
+        var template = new BundleSaleTemplate
+        {
+            TemplateCode = "BND-DEMO-001",
+            TemplateName = "Demo Bundle Pack",
+            Description = "Seeded fixed bundle template for integration testing",
+            Status = EntityStatus.Active,
+            CreatedAt = now,
+            Lines =
+            [
+                new BundleSaleTemplateLine
+                {
+                    ItemId = items[0].ItemId,
+                    UomId = uom.UomId,
+                    WarehouseId = warehouse.WarehouseId,
+                    Qty = 1m,
+                    UnitPrice = items[0].SalePrice.GetValueOrDefault(),
+                    IncludeInBundle = true,
+                    SortOrder = 1
+                },
+                new BundleSaleTemplateLine
+                {
+                    ItemId = items[1].ItemId,
+                    UomId = uom.UomId,
+                    WarehouseId = warehouse.WarehouseId,
+                    Qty = 1m,
+                    UnitPrice = items[1].SalePrice.GetValueOrDefault(),
+                    IncludeInBundle = true,
+                    SortOrder = 2
+                }
+            ]
+        };
+
+        db.BundleSaleTemplates.Add(template);
+        await db.SaveChangesAsync(ct);
+
+        var bundleSales = new[]
+        {
+            new BundleSale
+            {
+                BundleNo = $"BND-{now:yyyy}-00001",
+                BundleDate = now.Date.AddDays(-2),
+                CustomerId = customer.CustomerId,
+                CustomerSnapshotName = customer.DisplayName ?? customer.Name,
+                WarehouseId = warehouse.WarehouseId,
+                CashierUserId = user.UserId,
+                BundleSaleTemplateId = template.BundleSaleTemplateId,
+                BundleName = "Demo Bundle Draft",
+                BundleCode = "BND-DEMO-001",
+                Status = BundleSaleStatus.Draft,
+                ComponentSubtotal = items[0].SalePrice.GetValueOrDefault() + items[1].SalePrice.GetValueOrDefault(),
+                BundlePrice = 0m,
+                MarginAmount = -(items[0].SalePrice.GetValueOrDefault() + items[1].SalePrice.GetValueOrDefault()),
+                DiscountTotal = items[0].SalePrice.GetValueOrDefault() + items[1].SalePrice.GetValueOrDefault(),
+                TaxTotal = 0m,
+                GrandTotal = 0m,
+                CreatedAt = now.AddDays(-2),
+                Lines =
+                [
+                    new BundleSaleLine
+                    {
+                        ItemId = items[0].ItemId,
+                        Description = items[0].Name,
+                        Qty = 1m,
+                        UomId = uom.UomId,
+                        WarehouseId = warehouse.WarehouseId,
+                        UnitPrice = items[0].SalePrice.GetValueOrDefault(),
+                        LineTotal = items[0].SalePrice.GetValueOrDefault(),
+                        IncludeInBundle = true,
+                        IsComponent = true
+                    },
+                    new BundleSaleLine
+                    {
+                        ItemId = items[1].ItemId,
+                        Description = items[1].Name,
+                        Qty = 1m,
+                        UomId = uom.UomId,
+                        WarehouseId = warehouse.WarehouseId,
+                        UnitPrice = items[1].SalePrice.GetValueOrDefault(),
+                        LineTotal = items[1].SalePrice.GetValueOrDefault(),
+                        IncludeInBundle = true,
+                        IsComponent = true
+                    }
+                ]
+            },
+            new BundleSale
+            {
+                BundleNo = $"BND-{now:yyyy}-00002",
+                BundleDate = now.Date.AddDays(-1),
+                CustomerId = customer.CustomerId,
+                CustomerSnapshotName = customer.DisplayName ?? customer.Name,
+                WarehouseId = warehouse.WarehouseId,
+                CashierUserId = user.UserId,
+                BundleSaleTemplateId = template.BundleSaleTemplateId,
+                BundleName = "Demo Bundle Posted",
+                BundleCode = "BND-DEMO-001",
+                Status = BundleSaleStatus.Posted,
+                ComponentSubtotal = items[0].SalePrice.GetValueOrDefault() + items[1].SalePrice.GetValueOrDefault(),
+                BundlePrice = (items[0].SalePrice.GetValueOrDefault() + items[1].SalePrice.GetValueOrDefault()) - 10m,
+                MarginAmount = -10m,
+                DiscountTotal = 10m,
+                TaxTotal = 0m,
+                GrandTotal = (items[0].SalePrice.GetValueOrDefault() + items[1].SalePrice.GetValueOrDefault()) - 10m,
+                CreatedAt = now.AddDays(-1),
+                UpdatedAt = now.AddHours(-2),
+                Lines =
+                [
+                    new BundleSaleLine
+                    {
+                        ItemId = items[0].ItemId,
+                        Description = items[0].Name,
+                        Qty = 1m,
+                        UomId = uom.UomId,
+                        WarehouseId = warehouse.WarehouseId,
+                        UnitPrice = items[0].SalePrice.GetValueOrDefault(),
+                        LineTotal = items[0].SalePrice.GetValueOrDefault(),
+                        IncludeInBundle = true,
+                        IsComponent = true
+                    },
+                    new BundleSaleLine
+                    {
+                        ItemId = items[1].ItemId,
+                        Description = items[1].Name,
+                        Qty = 1m,
+                        UomId = uom.UomId,
+                        WarehouseId = warehouse.WarehouseId,
+                        UnitPrice = items[1].SalePrice.GetValueOrDefault(),
+                        LineTotal = items[1].SalePrice.GetValueOrDefault(),
+                        IncludeInBundle = true,
+                        IsComponent = true
+                    }
+                ]
+            },
+            new BundleSale
+            {
+                BundleNo = $"BND-{now:yyyy}-00003",
+                BundleDate = now.Date,
+                CustomerId = customer.CustomerId,
+                CustomerSnapshotName = customer.DisplayName ?? customer.Name,
+                WarehouseId = secondaryWarehouse.WarehouseId,
+                CashierUserId = user.UserId,
+                BundleSaleTemplateId = template.BundleSaleTemplateId,
+                BundleName = "Demo Bundle Cancelled",
+                BundleCode = "BND-DEMO-001",
+                Status = BundleSaleStatus.Cancelled,
+                ComponentSubtotal = items[0].SalePrice.GetValueOrDefault(),
+                BundlePrice = items[0].SalePrice.GetValueOrDefault(),
+                MarginAmount = 0m,
+                DiscountTotal = 0m,
+                TaxTotal = 0m,
+                GrandTotal = items[0].SalePrice.GetValueOrDefault(),
+                CreatedAt = now,
+                UpdatedAt = now,
+                Lines =
+                [
+                    new BundleSaleLine
+                    {
+                        ItemId = items[0].ItemId,
+                        Description = items[0].Name,
+                        Qty = 1m,
+                        UomId = uom.UomId,
+                        WarehouseId = secondaryWarehouse.WarehouseId,
+                        UnitPrice = items[0].SalePrice.GetValueOrDefault(),
+                        LineTotal = items[0].SalePrice.GetValueOrDefault(),
+                        IncludeInBundle = true,
+                        IsComponent = true
+                    }
+                ]
+            }
+        };
+
+        db.BundleSales.AddRange(bundleSales);
+        return true;
+    }
+
+    private static async Task<bool> SeedSampleSalesDocsAsync(ErpDbContext db, CancellationToken ct)
+    {
+        if (await db.SalesInvoices.AnyAsync(ct) || await db.SalesSlips.AnyAsync(ct))
+            return false;
+
+        var customer = await db.Customers.AsNoTracking()
+            .OrderBy(c => c.CustomerId)
+            .FirstOrDefaultAsync(ct);
+        var warehouse = await db.Warehouses.AsNoTracking()
+            .OrderBy(w => w.WarehouseId)
+            .FirstOrDefaultAsync(ct);
+        var secondaryWarehouse = await db.Warehouses.AsNoTracking()
+            .OrderByDescending(w => w.WarehouseId)
+            .FirstOrDefaultAsync(ct);
+        var items = await db.Items.AsNoTracking()
+            .OrderBy(i => i.ItemId)
+            .Take(2)
+            .ToListAsync(ct);
+        var uom = await db.Uoms.AsNoTracking()
+            .OrderBy(u => u.UomId)
+            .FirstOrDefaultAsync(ct);
+        var user = await db.Users.AsNoTracking()
+            .OrderBy(u => u.UserId)
+            .FirstOrDefaultAsync(ct);
+
+        if (customer is null || warehouse is null || secondaryWarehouse is null || items.Count < 2 || uom is null || user is null)
+            return false;
+
+        var postableItem = items[0];
+        var shortageItem = items[1];
+        var today = DateTime.UtcNow.Date;
+        var createdAt = DateTime.UtcNow.AddDays(-1);
+
+        db.SalesInvoices.AddRange(
+            new SalesInvoice
+            {
+                InvoiceNo = $"SI-{today:yyyy}-00001",
+                InvoiceDate = today.AddDays(-2),
+                CustomerId = customer.CustomerId,
+                CustomerSnapshotName = customer.Name,
+                CustomerSnapshotTaxNo = customer.TaxRegistrationNo,
+                WarehouseId = warehouse.WarehouseId,
+                InvoiceType = SalesInvoiceType.B2C,
+                Status = SalesInvoiceStatus.Draft,
+                Subtotal = 200m,
+                DiscountTotal = 0m,
+                TaxTotal = 0m,
+                GrandTotal = 200m,
+                RoundOff = 0m,
+                NetPayable = 200m,
+                PaidAmount = 0m,
+                BalanceAmount = 200m,
+                CreatedBy = user.UserId,
+                CreatedAt = createdAt,
+                Lines =
+                [
+                    new SalesInvoiceLine
+                    {
+                        ItemId = postableItem.ItemId,
+                        Description = postableItem.Name,
+                        Qty = 2m,
+                        FreeQty = 0m,
+                        UomId = uom.UomId,
+                        WarehouseId = warehouse.WarehouseId,
+                        UnitPrice = 100m,
+                        BaseCost = 0m,
+                        PriceSource = "seed",
+                        DiscountMode = SalesDiscountMode.Percentage,
+                        DiscountPct = 0m,
+                        DiscountAmount = 0m,
+                        NetUnitPrice = 100m,
+                        LineTotal = 200m,
+                        TaxPct = 0m,
+                        TaxAmount = 0m,
+                        IsFreeIssue = false
+                    }
+                ]
+            },
+            new SalesInvoice
+            {
+                InvoiceNo = $"SI-{today:yyyy}-00002",
+                InvoiceDate = today.AddDays(-1),
+                CustomerId = customer.CustomerId,
+                CustomerSnapshotName = customer.Name,
+                CustomerSnapshotTaxNo = customer.TaxRegistrationNo,
+                WarehouseId = secondaryWarehouse.WarehouseId,
+                InvoiceType = SalesInvoiceType.B2B,
+                Status = SalesInvoiceStatus.Draft,
+                Subtotal = 300m,
+                DiscountTotal = 0m,
+                TaxTotal = 0m,
+                GrandTotal = 300m,
+                RoundOff = 0m,
+                NetPayable = 300m,
+                PaidAmount = 0m,
+                BalanceAmount = 300m,
+                CreatedBy = user.UserId,
+                CreatedAt = createdAt,
+                Lines =
+                [
+                    new SalesInvoiceLine
+                    {
+                        ItemId = shortageItem.ItemId,
+                        Description = shortageItem.Name,
+                        Qty = 6m,
+                        FreeQty = 0m,
+                        UomId = uom.UomId,
+                        WarehouseId = secondaryWarehouse.WarehouseId,
+                        UnitPrice = 50m,
+                        BaseCost = 0m,
+                        PriceSource = "seed",
+                        DiscountMode = SalesDiscountMode.Percentage,
+                        DiscountPct = 0m,
+                        DiscountAmount = 0m,
+                        NetUnitPrice = 50m,
+                        LineTotal = 300m,
+                        TaxPct = 0m,
+                        TaxAmount = 0m,
+                        IsFreeIssue = false
+                    }
+                ]
+            },
+            new SalesInvoice
+            {
+                InvoiceNo = $"SI-{today:yyyy}-00003",
+                InvoiceDate = today,
+                CustomerId = customer.CustomerId,
+                CustomerSnapshotName = customer.Name,
+                CustomerSnapshotTaxNo = customer.TaxRegistrationNo,
+                WarehouseId = warehouse.WarehouseId,
+                InvoiceType = SalesInvoiceType.B2C,
+                Status = SalesInvoiceStatus.Posted,
+                Subtotal = 100m,
+                DiscountTotal = 0m,
+                TaxTotal = 0m,
+                GrandTotal = 100m,
+                RoundOff = 0m,
+                NetPayable = 100m,
+                PaidAmount = 100m,
+                BalanceAmount = 0m,
+                CreatedBy = user.UserId,
+                CreatedAt = createdAt,
+                UpdatedAt = DateTime.UtcNow,
+                Lines =
+                [
+                    new SalesInvoiceLine
+                    {
+                        ItemId = postableItem.ItemId,
+                        Description = postableItem.Name,
+                        Qty = 1m,
+                        FreeQty = 0m,
+                        UomId = uom.UomId,
+                        WarehouseId = warehouse.WarehouseId,
+                        UnitPrice = 100m,
+                        BaseCost = 0m,
+                        PriceSource = "seed",
+                        DiscountMode = SalesDiscountMode.Percentage,
+                        DiscountPct = 0m,
+                        DiscountAmount = 0m,
+                        NetUnitPrice = 100m,
+                        LineTotal = 100m,
+                        TaxPct = 0m,
+                        TaxAmount = 0m,
+                        IsFreeIssue = false
+                    }
+                ]
+            }
+        );
+
+        db.SalesSlips.AddRange(
+            new SalesSlip
+            {
+                SlipNo = $"SSL-{today:yyyy}-00001",
+                SlipDate = today.AddDays(-2),
+                CustomerId = customer.CustomerId,
+                CustomerSnapshotName = customer.Name,
+                WarehouseId = warehouse.WarehouseId,
+                CashierUserId = user.UserId,
+                Status = SalesSlipStatus.Draft,
+                Subtotal = 50m,
+                DiscountTotal = 0m,
+                TaxTotal = 0m,
+                GrandTotal = 50m,
+                PaidAmount = 0m,
+                BalanceAmount = 50m,
+                CreatedAt = createdAt,
+                Lines =
+                [
+                    new SalesSlipLine
+                    {
+                        ItemId = postableItem.ItemId,
+                        Description = postableItem.Name,
+                        Qty = 1m,
+                        FreeQty = 0m,
+                        UomId = uom.UomId,
+                        WarehouseId = warehouse.WarehouseId,
+                        UnitPrice = 50m,
+                        BaseCost = 0m,
+                        PriceSource = "seed",
+                        DiscountMode = SalesDiscountMode.Percentage,
+                        DiscountPct = 0m,
+                        DiscountAmount = 0m,
+                        NetUnitPrice = 50m,
+                        LineTotal = 50m,
+                        TaxPct = 0m,
+                        TaxAmount = 0m,
+                        IsFreeIssue = false
+                    }
+                ]
+            },
+            new SalesSlip
+            {
+                SlipNo = $"SSL-{today:yyyy}-00002",
+                SlipDate = today.AddDays(-1),
+                CustomerId = customer.CustomerId,
+                CustomerSnapshotName = customer.Name,
+                WarehouseId = secondaryWarehouse.WarehouseId,
+                CashierUserId = user.UserId,
+                Status = SalesSlipStatus.Draft,
+                Subtotal = 150m,
+                DiscountTotal = 15m,
+                TaxTotal = 0m,
+                GrandTotal = 135m,
+                PaidAmount = 0m,
+                BalanceAmount = 135m,
+                CreatedAt = createdAt,
+                Lines =
+                [
+                    new SalesSlipLine
+                    {
+                        ItemId = shortageItem.ItemId,
+                        Description = shortageItem.Name,
+                        Qty = 3m,
+                        FreeQty = 0m,
+                        UomId = uom.UomId,
+                        WarehouseId = secondaryWarehouse.WarehouseId,
+                        UnitPrice = 50m,
+                        BaseCost = 0m,
+                        PriceSource = "seed",
+                        DiscountMode = SalesDiscountMode.Percentage,
+                        DiscountPct = 10m,
+                        DiscountAmount = 15m,
+                        NetUnitPrice = 45m,
+                        LineTotal = 135m,
+                        TaxPct = 0m,
+                        TaxAmount = 0m,
+                        IsFreeIssue = false
+                    }
+                ]
+            }
+        );
+
+        return true;
+    }
 }
diff --git a/Backend/ERPCore/Infra/Persistence/ErpDbContext.cs b/Backend/ERPCore/Infra/Persistence/ErpDbContext.cs
index ca895cd..556890c 100644
--- a/Backend/ERPCore/Infra/Persistence/ErpDbContext.cs
+++ b/Backend/ERPCore/Infra/Persistence/ErpDbContext.cs
@@ -15,6 +15,7 @@ namespace ERPCore.Infra.Persistence;
 public class ErpDbContext : DbContext
 {
     private readonly ICurrentUser _currentUser;
+    private bool _writingAuditLogs;
 
     public ErpDbContext(DbContextOptions<ErpDbContext> options, ICurrentUser currentUser) : base(options)
     {
@@ -22,6 +23,7 @@ public class ErpDbContext : DbContext
     }
 
     // --- Master Data (docs/10 Part C.1) ---
+    public DbSet<Customer> Customers => Set<Customer>();
     public DbSet<Category> Categories => Set<Category>();
     public DbSet<SubCategory> SubCategories => Set<SubCategory>();
     public DbSet<Brand> Brands => Set<Brand>();
@@ -34,6 +36,7 @@ public class ErpDbContext : DbContext
     public DbSet<Vendor> Vendors => Set<Vendor>();
     public DbSet<Warehouse> Warehouses => Set<Warehouse>();
     public DbSet<Bin> Bins => Set<Bin>();
+    
     /// <summary>Singleton row (FR-MD-11).</summary>
     public DbSet<ProductConfig> ProductConfig => Set<ProductConfig>();
 
@@ -82,6 +85,16 @@ public class ErpDbContext : DbContext
     public DbSet<PurchaseReturn> PurchaseReturns => Set<PurchaseReturn>();
     public DbSet<PurchaseReturnLine> PurchaseReturnLines => Set<PurchaseReturnLine>();
 
+    // --- Sales (Phase 1) ---
+    public DbSet<SalesInvoice> SalesInvoices => Set<SalesInvoice>();
+    public DbSet<SalesInvoiceLine> SalesInvoiceLines => Set<SalesInvoiceLine>();
+    public DbSet<SalesSlip> SalesSlips => Set<SalesSlip>();
+    public DbSet<SalesSlipLine> SalesSlipLines => Set<SalesSlipLine>();
+    public DbSet<BundleSaleTemplate> BundleSaleTemplates => Set<BundleSaleTemplate>();
+    public DbSet<BundleSaleTemplateLine> BundleSaleTemplateLines => Set<BundleSaleTemplateLine>();
+    public DbSet<BundleSale> BundleSales => Set<BundleSale>();
+    public DbSet<BundleSaleLine> BundleSaleLines => Set<BundleSaleLine>();
+
     // --- Reference data (docs/10 Part C.7) ---
     public DbSet<ReasonCode> ReasonCodes => Set<ReasonCode>();
 
@@ -178,24 +191,44 @@ public class ErpDbContext : DbContext
     // persists the logs without re-auditing them.
     public override async Task<int> SaveChangesAsync(bool acceptAllChangesOnSuccess, CancellationToken ct = default)
     {
-        var pending = AuditScribe.Capture(ChangeTracker);
+        IReadOnlyList<PendingAudit> pending = _writingAuditLogs
+            ? Array.Empty<PendingAudit>()
+            : AuditScribe.Capture(ChangeTracker);
         var result = await base.SaveChangesAsync(acceptAllChangesOnSuccess, ct);
         if (pending.Count > 0)
         {
-            WriteAuditLogs(pending);
-            await base.SaveChangesAsync(acceptAllChangesOnSuccess, ct);
+            try
+            {
+                _writingAuditLogs = true;
+                WriteAuditLogs(pending);
+                await base.SaveChangesAsync(acceptAllChangesOnSuccess, ct);
+            }
+            finally
+            {
+                _writingAuditLogs = false;
+            }
         }
         return result;
     }
 
     public override int SaveChanges(bool acceptAllChangesOnSuccess)
     {
-        var pending = AuditScribe.Capture(ChangeTracker);
+        IReadOnlyList<PendingAudit> pending = _writingAuditLogs
+            ? Array.Empty<PendingAudit>()
+            : AuditScribe.Capture(ChangeTracker);
         var result = base.SaveChanges(acceptAllChangesOnSuccess);
         if (pending.Count > 0)
         {
-            WriteAuditLogs(pending);
-            base.SaveChanges(acceptAllChangesOnSuccess);
+            try
+            {
+                _writingAuditLogs = true;
+                WriteAuditLogs(pending);
+                base.SaveChanges(acceptAllChangesOnSuccess);
+            }
+            finally
+            {
+                _writingAuditLogs = false;
+            }
         }
         return result;
     }
diff --git a/Backend/ERPCore/Infra/Persistence/Migrations/20260715093552_InitialCreate.Designer.cs b/Backend/ERPCore/Infra/Persistence/Migrations/20260715093552_InitialCreate.Designer.cs
deleted file mode 100644
index 0406326..0000000
--- a/Backend/ERPCore/Infra/Persistence/Migrations/20260715093552_InitialCreate.Designer.cs
+++ /dev/null
@@ -1,2229 +0,0 @@
-// <auto-generated />
-using System;
-using ERPCore.Infra.Persistence;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace ERPCore.Infra.Persistence.Migrations
-{
-    [DbContext(typeof(ErpDbContext))]
-    [Migration("20260715093552_InitialCreate")]
-    partial class InitialCreate
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.9")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.AuditLog", b =>
-                {
-                    b.Property<int>("AuditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("AuditId"));
-
-                    b.Property<string>("Action")
-                        .IsRequired()
-                        .HasMaxLength(10)
-                        .HasColumnType("character varying(10)");
-
-                    b.Property<string>("ChangeSet")
-                        .IsRequired()
-                        .HasColumnType("jsonb");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("EntityId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("EntityType")
-                        .IsRequired()
-                        .HasMaxLength(80)
-                        .HasColumnType("character varying(80)");
-
-                    b.Property<int>("UserId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("AuditId");
-
-                    b.HasIndex("CreatedAt");
-
-                    b.HasIndex("UserId");
-
-                    b.HasIndex("EntityType", "EntityId");
-
-                    b.ToTable("audit_logs", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Batch", b =>
-                {
-                    b.Property<int>("BatchId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("BatchId"));
-
-                    b.Property<string>("BatchNo")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<DateOnly?>("ExpiryDate")
-                        .HasColumnType("date");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("BatchId");
-
-                    b.HasIndex("ItemId", "BatchNo")
-                        .IsUnique();
-
-                    b.ToTable("batches", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Bin", b =>
-                {
-                    b.Property<int>("BinId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("BinId"));
-
-                    b.Property<string>("BinType")
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("BinId");
-
-                    b.HasIndex("WarehouseId", "Code")
-                        .IsUnique();
-
-                    b.ToTable("bins", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Category", b =>
-                {
-                    b.Property<int>("CategoryId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CategoryId"));
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<int?>("ParentId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("CategoryId");
-
-                    b.HasIndex("ParentId");
-
-                    b.ToTable("categories", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Grn", b =>
-                {
-                    b.Property<int>("GrnId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GrnId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int?>("PoId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime?>("PostedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("VendorId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("GrnId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("PoId");
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("VendorId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("grns", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.GrnLine", b =>
-                {
-                    b.Property<int>("GrnLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GrnLineId"));
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("GrnId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("HoldStatus")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("PoLineId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("ReceivedValue")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("UnitCost")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.Property<int>("UomId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("GrnLineId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("BinId");
-
-                    b.HasIndex("GrnId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("PoLineId");
-
-                    b.HasIndex("UomId");
-
-                    b.ToTable("grn_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Item", b =>
-                {
-                    b.Property<int>("ItemId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ItemId"));
-
-                    b.Property<int>("BaseUomId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("CategoryId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int?>("DefaultVendorId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Description")
-                        .HasMaxLength(1000)
-                        .HasColumnType("character varying(1000)");
-
-                    b.Property<string>("ItemType")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Sku")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<string>("TaxClass")
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("TrackingMode")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("ItemId");
-
-                    b.HasIndex("BaseUomId");
-
-                    b.HasIndex("CategoryId");
-
-                    b.HasIndex("DefaultVendorId");
-
-                    b.HasIndex("Sku")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("items", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ItemReorder", b =>
-                {
-                    b.Property<int>("ReorderId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReorderId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("ReorderPoint")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("ReorderQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ReorderId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.HasIndex("ItemId", "WarehouseId")
-                        .IsUnique();
-
-                    b.ToTable("item_reorders", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.JournalEntryStub", b =>
-                {
-                    b.Property<int>("JournalId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("JournalId"));
-
-                    b.Property<decimal>("Amount")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<string>("CreditAccount")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("DebitAccount")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("SourceDocId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("SourceDocType")
-                        .IsRequired()
-                        .HasMaxLength(10)
-                        .HasColumnType("character varying(10)");
-
-                    b.HasKey("JournalId");
-
-                    b.HasIndex("SourceDocType", "SourceDocId");
-
-                    b.ToTable("journal_entry_stubs", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.NumberSequence", b =>
-                {
-                    b.Property<int>("SequenceId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("SequenceId"));
-
-                    b.Property<string>("DocType")
-                        .IsRequired()
-                        .HasMaxLength(10)
-                        .HasColumnType("character varying(10)")
-                        .HasColumnName("doc_type");
-
-                    b.Property<int>("LastNumber")
-                        .HasColumnType("integer")
-                        .HasColumnName("last_number");
-
-                    b.Property<int>("Year")
-                        .HasColumnType("integer")
-                        .HasColumnName("year");
-
-                    b.HasKey("SequenceId");
-
-                    b.HasIndex("DocType", "Year")
-                        .IsUnique();
-
-                    b.ToTable("number_sequences", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PoLine", b =>
-                {
-                    b.Property<int>("PoLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("PoLineId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("PoId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("QtyReceived")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("Tax")
-                        .HasPrecision(9, 4)
-                        .HasColumnType("numeric(9,4)");
-
-                    b.Property<decimal>("UnitPrice")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("UomId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("PoLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("PoId");
-
-                    b.HasIndex("UomId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("po_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseOrder", b =>
-                {
-                    b.Property<int>("PoId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("PoId"));
-
-                    b.Property<bool>("ApprovalRequired")
-                        .HasColumnType("boolean");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int?>("RequisitionId")
-                        .HasColumnType("integer");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("VendorId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("PoId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("RequisitionId");
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("VendorId");
-
-                    b.ToTable("purchase_orders", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturn", b =>
-                {
-                    b.Property<int>("ReturnId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReturnId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int>("ReasonCodeId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("VendorId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ReturnId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("ReasonCodeId");
-
-                    b.HasIndex("VendorId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("purchase_returns", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturnLine", b =>
-                {
-                    b.Property<int>("ReturnLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReturnLineId"));
-
-                    b.Property<int?>("GrnLineId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("ReturnId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ReturnLineId");
-
-                    b.HasIndex("GrnLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("ReturnId");
-
-                    b.ToTable("purchase_return_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ReasonCode", b =>
-                {
-                    b.Property<int>("ReasonCodeId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReasonCodeId"));
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("Context")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.HasKey("ReasonCodeId");
-
-                    b.HasIndex("Context", "Code")
-                        .IsUnique();
-
-                    b.ToTable("reason_codes", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Requisition", b =>
-                {
-                    b.Property<int>("RequisitionId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RequisitionId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int>("RequestedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("RequisitionId");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("RequestedBy");
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("requisitions", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RequisitionLine", b =>
-                {
-                    b.Property<int>("ReqLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReqLineId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<DateOnly?>("RequiredBy")
-                        .HasColumnType("date");
-
-                    b.Property<int>("RequisitionId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ReqLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("RequisitionId");
-
-                    b.ToTable("requisition_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Rfq", b =>
-                {
-                    b.Property<int>("RfqId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RfqId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int>("RequisitionId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("RfqId");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("RequisitionId");
-
-                    b.ToTable("rfqs", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RfqLine", b =>
-                {
-                    b.Property<int>("RfqLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RfqLineId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("RfqId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("RfqLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("RfqId");
-
-                    b.ToTable("rfq_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Serial", b =>
-                {
-                    b.Property<int>("SerialId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("SerialId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("SerialNo")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("character varying(100)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("SerialId");
-
-                    b.HasIndex("ItemId", "SerialNo")
-                        .IsUnique();
-
-                    b.ToTable("serials", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustment", b =>
-                {
-                    b.Property<int>("AdjustmentId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("AdjustmentId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int>("ReasonCodeId")
-                        .HasColumnType("integer");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("AdjustmentId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("ReasonCodeId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("stock_adjustments", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustmentLine", b =>
-                {
-                    b.Property<int>("AdjLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("AdjLineId"));
-
-                    b.Property<int>("AdjustmentId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("QtyDelta")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int?>("SerialId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("AdjLineId");
-
-                    b.HasIndex("AdjustmentId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("BinId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("SerialId");
-
-                    b.ToTable("stock_adjustment_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCount", b =>
-                {
-                    b.Property<int>("CountId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CountId"));
-
-                    b.Property<string>("CountType")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("CountId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("stock_counts", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCountLine", b =>
-                {
-                    b.Property<int>("CountLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CountLineId"));
-
-                    b.Property<int?>("BinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("CountId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal?>("CountedQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("SystemQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal?>("Variance")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.HasKey("CountLineId");
-
-                    b.HasIndex("BinId");
-
-                    b.HasIndex("CountId");
-
-                    b.HasIndex("ItemId");
-
-                    b.ToTable("stock_count_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockLayer", b =>
-                {
-                    b.Property<int>("LayerId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("LayerId"));
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("GrnLineId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("QtyReceived")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("QtyRemaining")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<DateTime>("ReceiptDate")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int?>("SerialId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("UnitCost")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("LayerId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("GrnLineId");
-
-                    b.HasIndex("SerialId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.HasIndex("ItemId", "WarehouseId", "ReceiptDate", "LayerId");
-
-                    b.ToTable("stock_layers", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockLedger", b =>
-                {
-                    b.Property<int>("LedgerId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("LedgerId"));
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BinId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Direction")
-                        .IsRequired()
-                        .HasMaxLength(5)
-                        .HasColumnType("character varying(5)");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("QtyBase")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("RunningBalance")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int?>("SerialId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("SourceDocId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("SourceDocType")
-                        .IsRequired()
-                        .HasMaxLength(10)
-                        .HasColumnType("character varying(10)");
-
-                    b.Property<decimal>("UnitCost")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.Property<int>("UserId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Value")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("LedgerId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("BinId");
-
-                    b.HasIndex("SerialId");
-
-                    b.HasIndex("UserId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.HasIndex("SourceDocType", "SourceDocId");
-
-                    b.HasIndex("ItemId", "WarehouseId", "CreatedAt");
-
-                    b.HasIndex("ItemId", "WarehouseId", "LedgerId");
-
-                    b.ToTable("stock_ledger", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransfer", b =>
-                {
-                    b.Property<int>("TransferId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TransferId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("DestWarehouseId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<int>("SrcWarehouseId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("TransferId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DestWarehouseId");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("SrcWarehouseId");
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("stock_transfers", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransferLine", b =>
-                {
-                    b.Property<int>("TransferLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TransferLineId"));
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("DestBinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("QtyReceived")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int?>("SerialId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("SrcBinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("TransferId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal?>("UnitCost")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.HasKey("TransferLineId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("DestBinId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("SerialId");
-
-                    b.HasIndex("SrcBinId");
-
-                    b.HasIndex("TransferId");
-
-                    b.ToTable("stock_transfer_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Uom", b =>
-                {
-                    b.Property<int>("UomId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("UomId"));
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.HasKey("UomId");
-
-                    b.HasIndex("Name")
-                        .IsUnique();
-
-                    b.ToTable("uoms", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.UomConversion", b =>
-                {
-                    b.Property<int>("ConversionId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ConversionId"));
-
-                    b.Property<decimal>("Factor")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.Property<int>("FromUomId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ToUomId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ConversionId");
-
-                    b.HasIndex("FromUomId");
-
-                    b.HasIndex("ToUomId");
-
-                    b.HasIndex("ItemId", "FromUomId", "ToUomId")
-                        .IsUnique();
-
-                    b.ToTable("uom_conversions", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.User", b =>
-                {
-                    b.Property<int>("UserId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("UserId"));
-
-                    b.Property<Guid?>("AuthUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("auth_user_id");
-
-                    b.Property<string>("DisplayName")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("Username")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("character varying(100)");
-
-                    b.HasKey("UserId");
-
-                    b.HasIndex("AuthUserId")
-                        .IsUnique();
-
-                    b.HasIndex("Username")
-                        .IsUnique();
-
-                    b.ToTable("users", (string)null);
-
-                    b.HasData(
-                        new
-                        {
-                            UserId = 1,
-                            DisplayName = "System",
-                            Status = "Active",
-                            Username = "system"
-                        });
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Vendor", b =>
-                {
-                    b.Property<int>("VendorId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("VendorId"));
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Currency")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(3)
-                        .HasColumnType("character varying(3)")
-                        .HasDefaultValue("LKR");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<string>("TaxReg")
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Terms")
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("VendorId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("vendors", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotation", b =>
-                {
-                    b.Property<int>("QuotationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("QuotationId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("RfqId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("VendorId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("QuotationId");
-
-                    b.HasIndex("VendorId");
-
-                    b.HasIndex("RfqId", "VendorId")
-                        .IsUnique();
-
-                    b.ToTable("vendor_quotations", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotationLine", b =>
-                {
-                    b.Property<int>("QuotationLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("QuotationLineId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("LeadDays")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("QuotationId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("UnitPrice")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.HasKey("QuotationLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("QuotationId");
-
-                    b.ToTable("vendor_quotation_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Warehouse", b =>
-                {
-                    b.Property<int>("WarehouseId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("WarehouseId"));
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.HasKey("WarehouseId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.ToTable("warehouses", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.AuditLog", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Batch", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Bin", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany("Bins")
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Category", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Category", "Parent")
-                        .WithMany("Children")
-                        .HasForeignKey("ParentId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("Parent");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Grn", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.PurchaseOrder", "PurchaseOrder")
-                        .WithMany()
-                        .HasForeignKey("PoId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "Vendor")
-                        .WithMany()
-                        .HasForeignKey("VendorId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("PurchaseOrder");
-
-                    b.Navigation("Vendor");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.GrnLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Batch", "Batch")
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", "Bin")
-                        .WithMany()
-                        .HasForeignKey("BinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Grn", "Grn")
-                        .WithMany("Lines")
-                        .HasForeignKey("GrnId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.PoLine", "PoLine")
-                        .WithMany()
-                        .HasForeignKey("PoLineId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
-                        .WithMany()
-                        .HasForeignKey("UomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Batch");
-
-                    b.Navigation("Bin");
-
-                    b.Navigation("Grn");
-
-                    b.Navigation("Item");
-
-                    b.Navigation("PoLine");
-
-                    b.Navigation("Uom");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Item", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "BaseUom")
-                        .WithMany()
-                        .HasForeignKey("BaseUomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Category", "Category")
-                        .WithMany()
-                        .HasForeignKey("CategoryId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "DefaultVendor")
-                        .WithMany()
-                        .HasForeignKey("DefaultVendorId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("BaseUom");
-
-                    b.Navigation("Category");
-
-                    b.Navigation("DefaultVendor");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ItemReorder", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany("ReorderSettings")
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PoLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.PurchaseOrder", "PurchaseOrder")
-                        .WithMany("Lines")
-                        .HasForeignKey("PoId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
-                        .WithMany()
-                        .HasForeignKey("UomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("PurchaseOrder");
-
-                    b.Navigation("Uom");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseOrder", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Requisition", "Requisition")
-                        .WithMany()
-                        .HasForeignKey("RequisitionId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "Vendor")
-                        .WithMany()
-                        .HasForeignKey("VendorId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("Requisition");
-
-                    b.Navigation("Vendor");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturn", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.ReasonCode", "ReasonCode")
-                        .WithMany()
-                        .HasForeignKey("ReasonCodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "Vendor")
-                        .WithMany()
-                        .HasForeignKey("VendorId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("ReasonCode");
-
-                    b.Navigation("Vendor");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturnLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.GrnLine", "GrnLine")
-                        .WithMany()
-                        .HasForeignKey("GrnLineId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.PurchaseReturn", "Return")
-                        .WithMany("Lines")
-                        .HasForeignKey("ReturnId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("GrnLine");
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Return");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Requisition", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Requester")
-                        .WithMany()
-                        .HasForeignKey("RequestedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Requester");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RequisitionLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Requisition", "Requisition")
-                        .WithMany("Lines")
-                        .HasForeignKey("RequisitionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Requisition");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Rfq", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Requisition", "Requisition")
-                        .WithMany()
-                        .HasForeignKey("RequisitionId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Requisition");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RfqLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Rfq", "Rfq")
-                        .WithMany("Lines")
-                        .HasForeignKey("RfqId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Rfq");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Serial", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustment", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.ReasonCode", "ReasonCode")
-                        .WithMany()
-                        .HasForeignKey("ReasonCodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("ReasonCode");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustmentLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.StockAdjustment", "Adjustment")
-                        .WithMany("Lines")
-                        .HasForeignKey("AdjustmentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Batch", null)
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("BinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Serial", null)
-                        .WithMany()
-                        .HasForeignKey("SerialId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("Adjustment");
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCount", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCountLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("BinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.StockCount", "Count")
-                        .WithMany("Lines")
-                        .HasForeignKey("CountId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Count");
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockLayer", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Batch", "Batch")
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.GrnLine", "GrnLine")
-                        .WithMany()
-                        .HasForeignKey("GrnLineId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Serial", "Serial")
-                        .WithMany()
-                        .HasForeignKey("SerialId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Batch");
-
-                    b.Navigation("GrnLine");
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Serial");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockLedger", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Batch", null)
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("BinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", null)
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Serial", null)
-                        .WithMany()
-                        .HasForeignKey("SerialId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.User", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", null)
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransfer", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "DestWarehouse")
-                        .WithMany()
-                        .HasForeignKey("DestWarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "SrcWarehouse")
-                        .WithMany()
-                        .HasForeignKey("SrcWarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("DestWarehouse");
-
-                    b.Navigation("SrcWarehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransferLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Batch", null)
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("DestBinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Serial", null)
-                        .WithMany()
-                        .HasForeignKey("SerialId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("SrcBinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.StockTransfer", "Transfer")
-                        .WithMany("Lines")
-                        .HasForeignKey("TransferId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Transfer");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.UomConversion", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "FromUom")
-                        .WithMany()
-                        .HasForeignKey("FromUomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany("UomConversions")
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "ToUom")
-                        .WithMany()
-                        .HasForeignKey("ToUomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("FromUom");
-
-                    b.Navigation("Item");
-
-                    b.Navigation("ToUom");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotation", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Rfq", "Rfq")
-                        .WithMany("Quotations")
-                        .HasForeignKey("RfqId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "Vendor")
-                        .WithMany()
-                        .HasForeignKey("VendorId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Rfq");
-
-                    b.Navigation("Vendor");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotationLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.VendorQuotation", "Quotation")
-                        .WithMany("Lines")
-                        .HasForeignKey("QuotationId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Quotation");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Category", b =>
-                {
-                    b.Navigation("Children");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Grn", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Item", b =>
-                {
-                    b.Navigation("ReorderSettings");
-
-                    b.Navigation("UomConversions");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseOrder", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturn", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Requisition", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Rfq", b =>
-                {
-                    b.Navigation("Lines");
-
-                    b.Navigation("Quotations");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustment", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCount", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransfer", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotation", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Warehouse", b =>
-                {
-                    b.Navigation("Bins");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/Backend/ERPCore/Infra/Persistence/Migrations/20260715093552_InitialCreate.cs b/Backend/ERPCore/Infra/Persistence/Migrations/20260715093552_InitialCreate.cs
deleted file mode 100644
index 1d0bd52..0000000
--- a/Backend/ERPCore/Infra/Persistence/Migrations/20260715093552_InitialCreate.cs
+++ /dev/null
@@ -1,1791 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace ERPCore.Infra.Persistence.Migrations
-{
-    /// <inheritdoc />
-    public partial class InitialCreate : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "categories",
-                columns: table => new
-                {
-                    CategoryId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    Name = table.Column<string>(type: "character varying(200)", maxLength: 200, nullable: false),
-                    ParentId = table.Column<int>(type: "integer", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_categories", x => x.CategoryId);
-                    table.ForeignKey(
-                        name: "FK_categories_categories_ParentId",
-                        column: x => x.ParentId,
-                        principalTable: "categories",
-                        principalColumn: "CategoryId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "journal_entry_stubs",
-                columns: table => new
-                {
-                    JournalId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    SourceDocType = table.Column<string>(type: "character varying(10)", maxLength: 10, nullable: false),
-                    SourceDocId = table.Column<int>(type: "integer", nullable: false),
-                    DebitAccount = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
-                    CreditAccount = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
-                    Amount = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_journal_entry_stubs", x => x.JournalId);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "number_sequences",
-                columns: table => new
-                {
-                    SequenceId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    doc_type = table.Column<string>(type: "character varying(10)", maxLength: 10, nullable: false),
-                    year = table.Column<int>(type: "integer", nullable: false),
-                    last_number = table.Column<int>(type: "integer", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_number_sequences", x => x.SequenceId);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "reason_codes",
-                columns: table => new
-                {
-                    ReasonCodeId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    Code = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
-                    Description = table.Column<string>(type: "character varying(200)", maxLength: 200, nullable: false),
-                    Context = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_reason_codes", x => x.ReasonCodeId);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "uoms",
-                columns: table => new
-                {
-                    UomId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    Name = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_uoms", x => x.UomId);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "users",
-                columns: table => new
-                {
-                    UserId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    Username = table.Column<string>(type: "character varying(100)", maxLength: 100, nullable: false),
-                    DisplayName = table.Column<string>(type: "character varying(200)", maxLength: 200, nullable: false),
-                    Status = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
-                    auth_user_id = table.Column<Guid>(type: "uuid", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_users", x => x.UserId);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "vendors",
-                columns: table => new
-                {
-                    VendorId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    Code = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false),
-                    Name = table.Column<string>(type: "character varying(200)", maxLength: 200, nullable: false),
-                    Terms = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: true),
-                    TaxReg = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: true),
-                    Currency = table.Column<string>(type: "character varying(3)", maxLength: 3, nullable: false, defaultValue: "LKR"),
-                    Status = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false, defaultValue: "Active"),
-                    CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
-                    UpdatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
-                    xmin = table.Column<uint>(type: "xid", rowVersion: true, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_vendors", x => x.VendorId);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "warehouses",
-                columns: table => new
-                {
-                    WarehouseId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    Code = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false),
-                    Name = table.Column<string>(type: "character varying(200)", maxLength: 200, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_warehouses", x => x.WarehouseId);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "audit_logs",
-                columns: table => new
-                {
-                    AuditId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    UserId = table.Column<int>(type: "integer", nullable: false),
-                    EntityType = table.Column<string>(type: "character varying(80)", maxLength: 80, nullable: false),
-                    EntityId = table.Column<int>(type: "integer", nullable: false),
-                    Action = table.Column<string>(type: "character varying(10)", maxLength: 10, nullable: false),
-                    ChangeSet = table.Column<string>(type: "jsonb", nullable: false),
-                    CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_audit_logs", x => x.AuditId);
-                    table.ForeignKey(
-                        name: "FK_audit_logs_users_UserId",
-                        column: x => x.UserId,
-                        principalTable: "users",
-                        principalColumn: "UserId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "requisitions",
-                columns: table => new
-                {
-                    RequisitionId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    DocNo = table.Column<string>(type: "character varying(30)", maxLength: 30, nullable: false),
-                    RequestedBy = table.Column<int>(type: "integer", nullable: false),
-                    Status = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
-                    CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_requisitions", x => x.RequisitionId);
-                    table.ForeignKey(
-                        name: "FK_requisitions_users_RequestedBy",
-                        column: x => x.RequestedBy,
-                        principalTable: "users",
-                        principalColumn: "UserId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "items",
-                columns: table => new
-                {
-                    ItemId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    Sku = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false),
-                    Name = table.Column<string>(type: "character varying(200)", maxLength: 200, nullable: false),
-                    Description = table.Column<string>(type: "character varying(1000)", maxLength: 1000, nullable: true),
-                    CategoryId = table.Column<int>(type: "integer", nullable: false),
-                    BaseUomId = table.Column<int>(type: "integer", nullable: false),
-                    DefaultVendorId = table.Column<int>(type: "integer", nullable: true),
-                    ItemType = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
-                    TrackingMode = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
-                    TaxClass = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: true),
-                    Status = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false, defaultValue: "Active"),
-                    CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
-                    UpdatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
-                    xmin = table.Column<uint>(type: "xid", rowVersion: true, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_items", x => x.ItemId);
-                    table.ForeignKey(
-                        name: "FK_items_categories_CategoryId",
-                        column: x => x.CategoryId,
-                        principalTable: "categories",
-                        principalColumn: "CategoryId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_items_uoms_BaseUomId",
-                        column: x => x.BaseUomId,
-                        principalTable: "uoms",
-                        principalColumn: "UomId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_items_vendors_DefaultVendorId",
-                        column: x => x.DefaultVendorId,
-                        principalTable: "vendors",
-                        principalColumn: "VendorId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "bins",
-                columns: table => new
-                {
-                    BinId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    WarehouseId = table.Column<int>(type: "integer", nullable: false),
-                    Code = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false),
-                    BinType = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_bins", x => x.BinId);
-                    table.ForeignKey(
-                        name: "FK_bins_warehouses_WarehouseId",
-                        column: x => x.WarehouseId,
-                        principalTable: "warehouses",
-                        principalColumn: "WarehouseId",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "purchase_returns",
-                columns: table => new
-                {
-                    ReturnId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    DocNo = table.Column<string>(type: "character varying(30)", maxLength: 30, nullable: false),
-                    VendorId = table.Column<int>(type: "integer", nullable: false),
-                    WarehouseId = table.Column<int>(type: "integer", nullable: false),
-                    ReasonCodeId = table.Column<int>(type: "integer", nullable: false),
-                    Status = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
-                    CreatedBy = table.Column<int>(type: "integer", nullable: false),
-                    CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_purchase_returns", x => x.ReturnId);
-                    table.ForeignKey(
-                        name: "FK_purchase_returns_reason_codes_ReasonCodeId",
-                        column: x => x.ReasonCodeId,
-                        principalTable: "reason_codes",
-                        principalColumn: "ReasonCodeId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_purchase_returns_users_CreatedBy",
-                        column: x => x.CreatedBy,
-                        principalTable: "users",
-                        principalColumn: "UserId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_purchase_returns_vendors_VendorId",
-                        column: x => x.VendorId,
-                        principalTable: "vendors",
-                        principalColumn: "VendorId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_purchase_returns_warehouses_WarehouseId",
-                        column: x => x.WarehouseId,
-                        principalTable: "warehouses",
-                        principalColumn: "WarehouseId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "stock_adjustments",
-                columns: table => new
-                {
-                    AdjustmentId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    DocNo = table.Column<string>(type: "character varying(30)", maxLength: 30, nullable: false),
-                    WarehouseId = table.Column<int>(type: "integer", nullable: false),
-                    ReasonCodeId = table.Column<int>(type: "integer", nullable: false),
-                    Status = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
-                    CreatedBy = table.Column<int>(type: "integer", nullable: false),
-                    CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
-                    xmin = table.Column<uint>(type: "xid", rowVersion: true, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_stock_adjustments", x => x.AdjustmentId);
-                    table.ForeignKey(
-                        name: "FK_stock_adjustments_reason_codes_ReasonCodeId",
-                        column: x => x.ReasonCodeId,
-                        principalTable: "reason_codes",
-                        principalColumn: "ReasonCodeId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_adjustments_users_CreatedBy",
-                        column: x => x.CreatedBy,
-                        principalTable: "users",
-                        principalColumn: "UserId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_adjustments_warehouses_WarehouseId",
-                        column: x => x.WarehouseId,
-                        principalTable: "warehouses",
-                        principalColumn: "WarehouseId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "stock_counts",
-                columns: table => new
-                {
-                    CountId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    DocNo = table.Column<string>(type: "character varying(30)", maxLength: 30, nullable: false),
-                    WarehouseId = table.Column<int>(type: "integer", nullable: false),
-                    CountType = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
-                    Status = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
-                    CreatedBy = table.Column<int>(type: "integer", nullable: false),
-                    CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
-                    xmin = table.Column<uint>(type: "xid", rowVersion: true, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_stock_counts", x => x.CountId);
-                    table.ForeignKey(
-                        name: "FK_stock_counts_users_CreatedBy",
-                        column: x => x.CreatedBy,
-                        principalTable: "users",
-                        principalColumn: "UserId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_counts_warehouses_WarehouseId",
-                        column: x => x.WarehouseId,
-                        principalTable: "warehouses",
-                        principalColumn: "WarehouseId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "stock_transfers",
-                columns: table => new
-                {
-                    TransferId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    DocNo = table.Column<string>(type: "character varying(30)", maxLength: 30, nullable: false),
-                    SrcWarehouseId = table.Column<int>(type: "integer", nullable: false),
-                    DestWarehouseId = table.Column<int>(type: "integer", nullable: false),
-                    Status = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
-                    CreatedBy = table.Column<int>(type: "integer", nullable: false),
-                    CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
-                    xmin = table.Column<uint>(type: "xid", rowVersion: true, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_stock_transfers", x => x.TransferId);
-                    table.ForeignKey(
-                        name: "FK_stock_transfers_users_CreatedBy",
-                        column: x => x.CreatedBy,
-                        principalTable: "users",
-                        principalColumn: "UserId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_transfers_warehouses_DestWarehouseId",
-                        column: x => x.DestWarehouseId,
-                        principalTable: "warehouses",
-                        principalColumn: "WarehouseId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_transfers_warehouses_SrcWarehouseId",
-                        column: x => x.SrcWarehouseId,
-                        principalTable: "warehouses",
-                        principalColumn: "WarehouseId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "purchase_orders",
-                columns: table => new
-                {
-                    PoId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    DocNo = table.Column<string>(type: "character varying(30)", maxLength: 30, nullable: false),
-                    VendorId = table.Column<int>(type: "integer", nullable: false),
-                    RequisitionId = table.Column<int>(type: "integer", nullable: true),
-                    Status = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
-                    ApprovalRequired = table.Column<bool>(type: "boolean", nullable: false),
-                    CreatedBy = table.Column<int>(type: "integer", nullable: false),
-                    CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
-                    UpdatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
-                    xmin = table.Column<uint>(type: "xid", rowVersion: true, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_purchase_orders", x => x.PoId);
-                    table.ForeignKey(
-                        name: "FK_purchase_orders_requisitions_RequisitionId",
-                        column: x => x.RequisitionId,
-                        principalTable: "requisitions",
-                        principalColumn: "RequisitionId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_purchase_orders_users_CreatedBy",
-                        column: x => x.CreatedBy,
-                        principalTable: "users",
-                        principalColumn: "UserId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_purchase_orders_vendors_VendorId",
-                        column: x => x.VendorId,
-                        principalTable: "vendors",
-                        principalColumn: "VendorId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "rfqs",
-                columns: table => new
-                {
-                    RfqId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    DocNo = table.Column<string>(type: "character varying(30)", maxLength: 30, nullable: false),
-                    RequisitionId = table.Column<int>(type: "integer", nullable: false),
-                    Status = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
-                    CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_rfqs", x => x.RfqId);
-                    table.ForeignKey(
-                        name: "FK_rfqs_requisitions_RequisitionId",
-                        column: x => x.RequisitionId,
-                        principalTable: "requisitions",
-                        principalColumn: "RequisitionId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "batches",
-                columns: table => new
-                {
-                    BatchId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    ItemId = table.Column<int>(type: "integer", nullable: false),
-                    BatchNo = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false),
-                    ExpiryDate = table.Column<DateOnly>(type: "date", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_batches", x => x.BatchId);
-                    table.ForeignKey(
-                        name: "FK_batches_items_ItemId",
-                        column: x => x.ItemId,
-                        principalTable: "items",
-                        principalColumn: "ItemId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "item_reorders",
-                columns: table => new
-                {
-                    ReorderId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    ItemId = table.Column<int>(type: "integer", nullable: false),
-                    WarehouseId = table.Column<int>(type: "integer", nullable: false),
-                    ReorderPoint = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
-                    ReorderQty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_item_reorders", x => x.ReorderId);
-                    table.ForeignKey(
-                        name: "FK_item_reorders_items_ItemId",
-                        column: x => x.ItemId,
-                        principalTable: "items",
-                        principalColumn: "ItemId",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_item_reorders_warehouses_WarehouseId",
-                        column: x => x.WarehouseId,
-                        principalTable: "warehouses",
-                        principalColumn: "WarehouseId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "requisition_lines",
-                columns: table => new
-                {
-                    ReqLineId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    RequisitionId = table.Column<int>(type: "integer", nullable: false),
-                    ItemId = table.Column<int>(type: "integer", nullable: false),
-                    Qty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
-                    RequiredBy = table.Column<DateOnly>(type: "date", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_requisition_lines", x => x.ReqLineId);
-                    table.ForeignKey(
-                        name: "FK_requisition_lines_items_ItemId",
-                        column: x => x.ItemId,
-                        principalTable: "items",
-                        principalColumn: "ItemId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_requisition_lines_requisitions_RequisitionId",
-                        column: x => x.RequisitionId,
-                        principalTable: "requisitions",
-                        principalColumn: "RequisitionId",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "serials",
-                columns: table => new
-                {
-                    SerialId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    ItemId = table.Column<int>(type: "integer", nullable: false),
-                    SerialNo = table.Column<string>(type: "character varying(100)", maxLength: 100, nullable: false),
-                    Status = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_serials", x => x.SerialId);
-                    table.ForeignKey(
-                        name: "FK_serials_items_ItemId",
-                        column: x => x.ItemId,
-                        principalTable: "items",
-                        principalColumn: "ItemId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "uom_conversions",
-                columns: table => new
-                {
-                    ConversionId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    ItemId = table.Column<int>(type: "integer", nullable: false),
-                    FromUomId = table.Column<int>(type: "integer", nullable: false),
-                    ToUomId = table.Column<int>(type: "integer", nullable: false),
-                    Factor = table.Column<decimal>(type: "numeric(18,6)", precision: 18, scale: 6, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_uom_conversions", x => x.ConversionId);
-                    table.ForeignKey(
-                        name: "FK_uom_conversions_items_ItemId",
-                        column: x => x.ItemId,
-                        principalTable: "items",
-                        principalColumn: "ItemId",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_uom_conversions_uoms_FromUomId",
-                        column: x => x.FromUomId,
-                        principalTable: "uoms",
-                        principalColumn: "UomId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_uom_conversions_uoms_ToUomId",
-                        column: x => x.ToUomId,
-                        principalTable: "uoms",
-                        principalColumn: "UomId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "stock_count_lines",
-                columns: table => new
-                {
-                    CountLineId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    CountId = table.Column<int>(type: "integer", nullable: false),
-                    ItemId = table.Column<int>(type: "integer", nullable: false),
-                    BinId = table.Column<int>(type: "integer", nullable: true),
-                    SystemQty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
-                    CountedQty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: true),
-                    Variance = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_stock_count_lines", x => x.CountLineId);
-                    table.ForeignKey(
-                        name: "FK_stock_count_lines_bins_BinId",
-                        column: x => x.BinId,
-                        principalTable: "bins",
-                        principalColumn: "BinId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_count_lines_items_ItemId",
-                        column: x => x.ItemId,
-                        principalTable: "items",
-                        principalColumn: "ItemId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_count_lines_stock_counts_CountId",
-                        column: x => x.CountId,
-                        principalTable: "stock_counts",
-                        principalColumn: "CountId",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "grns",
-                columns: table => new
-                {
-                    GrnId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    DocNo = table.Column<string>(type: "character varying(30)", maxLength: 30, nullable: false),
-                    PoId = table.Column<int>(type: "integer", nullable: true),
-                    VendorId = table.Column<int>(type: "integer", nullable: false),
-                    WarehouseId = table.Column<int>(type: "integer", nullable: false),
-                    Status = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false),
-                    CreatedBy = table.Column<int>(type: "integer", nullable: false),
-                    CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
-                    PostedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
-                    xmin = table.Column<uint>(type: "xid", rowVersion: true, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_grns", x => x.GrnId);
-                    table.ForeignKey(
-                        name: "FK_grns_purchase_orders_PoId",
-                        column: x => x.PoId,
-                        principalTable: "purchase_orders",
-                        principalColumn: "PoId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_grns_users_CreatedBy",
-                        column: x => x.CreatedBy,
-                        principalTable: "users",
-                        principalColumn: "UserId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_grns_vendors_VendorId",
-                        column: x => x.VendorId,
-                        principalTable: "vendors",
-                        principalColumn: "VendorId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_grns_warehouses_WarehouseId",
-                        column: x => x.WarehouseId,
-                        principalTable: "warehouses",
-                        principalColumn: "WarehouseId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "po_lines",
-                columns: table => new
-                {
-                    PoLineId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    PoId = table.Column<int>(type: "integer", nullable: false),
-                    ItemId = table.Column<int>(type: "integer", nullable: false),
-                    UomId = table.Column<int>(type: "integer", nullable: false),
-                    WarehouseId = table.Column<int>(type: "integer", nullable: false),
-                    Qty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
-                    UnitPrice = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
-                    Tax = table.Column<decimal>(type: "numeric(9,4)", precision: 9, scale: 4, nullable: false),
-                    QtyReceived = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_po_lines", x => x.PoLineId);
-                    table.ForeignKey(
-                        name: "FK_po_lines_items_ItemId",
-                        column: x => x.ItemId,
-                        principalTable: "items",
-                        principalColumn: "ItemId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_po_lines_purchase_orders_PoId",
-                        column: x => x.PoId,
-                        principalTable: "purchase_orders",
-                        principalColumn: "PoId",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_po_lines_uoms_UomId",
-                        column: x => x.UomId,
-                        principalTable: "uoms",
-                        principalColumn: "UomId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_po_lines_warehouses_WarehouseId",
-                        column: x => x.WarehouseId,
-                        principalTable: "warehouses",
-                        principalColumn: "WarehouseId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "rfq_lines",
-                columns: table => new
-                {
-                    RfqLineId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    RfqId = table.Column<int>(type: "integer", nullable: false),
-                    ItemId = table.Column<int>(type: "integer", nullable: false),
-                    Qty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_rfq_lines", x => x.RfqLineId);
-                    table.ForeignKey(
-                        name: "FK_rfq_lines_items_ItemId",
-                        column: x => x.ItemId,
-                        principalTable: "items",
-                        principalColumn: "ItemId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_rfq_lines_rfqs_RfqId",
-                        column: x => x.RfqId,
-                        principalTable: "rfqs",
-                        principalColumn: "RfqId",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "vendor_quotations",
-                columns: table => new
-                {
-                    QuotationId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    RfqId = table.Column<int>(type: "integer", nullable: false),
-                    VendorId = table.Column<int>(type: "integer", nullable: false),
-                    CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_vendor_quotations", x => x.QuotationId);
-                    table.ForeignKey(
-                        name: "FK_vendor_quotations_rfqs_RfqId",
-                        column: x => x.RfqId,
-                        principalTable: "rfqs",
-                        principalColumn: "RfqId",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_vendor_quotations_vendors_VendorId",
-                        column: x => x.VendorId,
-                        principalTable: "vendors",
-                        principalColumn: "VendorId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "stock_adjustment_lines",
-                columns: table => new
-                {
-                    AdjLineId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    AdjustmentId = table.Column<int>(type: "integer", nullable: false),
-                    ItemId = table.Column<int>(type: "integer", nullable: false),
-                    BinId = table.Column<int>(type: "integer", nullable: true),
-                    BatchId = table.Column<int>(type: "integer", nullable: true),
-                    SerialId = table.Column<int>(type: "integer", nullable: true),
-                    QtyDelta = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_stock_adjustment_lines", x => x.AdjLineId);
-                    table.ForeignKey(
-                        name: "FK_stock_adjustment_lines_batches_BatchId",
-                        column: x => x.BatchId,
-                        principalTable: "batches",
-                        principalColumn: "BatchId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_adjustment_lines_bins_BinId",
-                        column: x => x.BinId,
-                        principalTable: "bins",
-                        principalColumn: "BinId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_adjustment_lines_items_ItemId",
-                        column: x => x.ItemId,
-                        principalTable: "items",
-                        principalColumn: "ItemId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_adjustment_lines_serials_SerialId",
-                        column: x => x.SerialId,
-                        principalTable: "serials",
-                        principalColumn: "SerialId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_adjustment_lines_stock_adjustments_AdjustmentId",
-                        column: x => x.AdjustmentId,
-                        principalTable: "stock_adjustments",
-                        principalColumn: "AdjustmentId",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "stock_ledger",
-                columns: table => new
-                {
-                    LedgerId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    ItemId = table.Column<int>(type: "integer", nullable: false),
-                    WarehouseId = table.Column<int>(type: "integer", nullable: false),
-                    BinId = table.Column<int>(type: "integer", nullable: true),
-                    BatchId = table.Column<int>(type: "integer", nullable: true),
-                    SerialId = table.Column<int>(type: "integer", nullable: true),
-                    UserId = table.Column<int>(type: "integer", nullable: false),
-                    Direction = table.Column<string>(type: "character varying(5)", maxLength: 5, nullable: false),
-                    QtyBase = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
-                    UnitCost = table.Column<decimal>(type: "numeric(18,6)", precision: 18, scale: 6, nullable: false),
-                    Value = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
-                    RunningBalance = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
-                    SourceDocType = table.Column<string>(type: "character varying(10)", maxLength: 10, nullable: false),
-                    SourceDocId = table.Column<int>(type: "integer", nullable: false),
-                    CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_stock_ledger", x => x.LedgerId);
-                    table.ForeignKey(
-                        name: "FK_stock_ledger_batches_BatchId",
-                        column: x => x.BatchId,
-                        principalTable: "batches",
-                        principalColumn: "BatchId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_ledger_bins_BinId",
-                        column: x => x.BinId,
-                        principalTable: "bins",
-                        principalColumn: "BinId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_ledger_items_ItemId",
-                        column: x => x.ItemId,
-                        principalTable: "items",
-                        principalColumn: "ItemId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_ledger_serials_SerialId",
-                        column: x => x.SerialId,
-                        principalTable: "serials",
-                        principalColumn: "SerialId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_ledger_users_UserId",
-                        column: x => x.UserId,
-                        principalTable: "users",
-                        principalColumn: "UserId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_ledger_warehouses_WarehouseId",
-                        column: x => x.WarehouseId,
-                        principalTable: "warehouses",
-                        principalColumn: "WarehouseId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "stock_transfer_lines",
-                columns: table => new
-                {
-                    TransferLineId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    TransferId = table.Column<int>(type: "integer", nullable: false),
-                    ItemId = table.Column<int>(type: "integer", nullable: false),
-                    SrcBinId = table.Column<int>(type: "integer", nullable: true),
-                    DestBinId = table.Column<int>(type: "integer", nullable: true),
-                    BatchId = table.Column<int>(type: "integer", nullable: true),
-                    SerialId = table.Column<int>(type: "integer", nullable: true),
-                    Qty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
-                    UnitCost = table.Column<decimal>(type: "numeric(18,6)", precision: 18, scale: 6, nullable: true),
-                    QtyReceived = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_stock_transfer_lines", x => x.TransferLineId);
-                    table.ForeignKey(
-                        name: "FK_stock_transfer_lines_batches_BatchId",
-                        column: x => x.BatchId,
-                        principalTable: "batches",
-                        principalColumn: "BatchId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_transfer_lines_bins_DestBinId",
-                        column: x => x.DestBinId,
-                        principalTable: "bins",
-                        principalColumn: "BinId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_transfer_lines_bins_SrcBinId",
-                        column: x => x.SrcBinId,
-                        principalTable: "bins",
-                        principalColumn: "BinId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_transfer_lines_items_ItemId",
-                        column: x => x.ItemId,
-                        principalTable: "items",
-                        principalColumn: "ItemId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_transfer_lines_serials_SerialId",
-                        column: x => x.SerialId,
-                        principalTable: "serials",
-                        principalColumn: "SerialId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_transfer_lines_stock_transfers_TransferId",
-                        column: x => x.TransferId,
-                        principalTable: "stock_transfers",
-                        principalColumn: "TransferId",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "grn_lines",
-                columns: table => new
-                {
-                    GrnLineId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    GrnId = table.Column<int>(type: "integer", nullable: false),
-                    PoLineId = table.Column<int>(type: "integer", nullable: true),
-                    ItemId = table.Column<int>(type: "integer", nullable: false),
-                    UomId = table.Column<int>(type: "integer", nullable: false),
-                    BinId = table.Column<int>(type: "integer", nullable: true),
-                    BatchId = table.Column<int>(type: "integer", nullable: true),
-                    Qty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
-                    UnitCost = table.Column<decimal>(type: "numeric(18,6)", precision: 18, scale: 6, nullable: false),
-                    ReceivedValue = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
-                    HoldStatus = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_grn_lines", x => x.GrnLineId);
-                    table.ForeignKey(
-                        name: "FK_grn_lines_batches_BatchId",
-                        column: x => x.BatchId,
-                        principalTable: "batches",
-                        principalColumn: "BatchId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_grn_lines_bins_BinId",
-                        column: x => x.BinId,
-                        principalTable: "bins",
-                        principalColumn: "BinId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_grn_lines_grns_GrnId",
-                        column: x => x.GrnId,
-                        principalTable: "grns",
-                        principalColumn: "GrnId",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_grn_lines_items_ItemId",
-                        column: x => x.ItemId,
-                        principalTable: "items",
-                        principalColumn: "ItemId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_grn_lines_po_lines_PoLineId",
-                        column: x => x.PoLineId,
-                        principalTable: "po_lines",
-                        principalColumn: "PoLineId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_grn_lines_uoms_UomId",
-                        column: x => x.UomId,
-                        principalTable: "uoms",
-                        principalColumn: "UomId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "vendor_quotation_lines",
-                columns: table => new
-                {
-                    QuotationLineId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    QuotationId = table.Column<int>(type: "integer", nullable: false),
-                    ItemId = table.Column<int>(type: "integer", nullable: false),
-                    UnitPrice = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
-                    LeadDays = table.Column<int>(type: "integer", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_vendor_quotation_lines", x => x.QuotationLineId);
-                    table.ForeignKey(
-                        name: "FK_vendor_quotation_lines_items_ItemId",
-                        column: x => x.ItemId,
-                        principalTable: "items",
-                        principalColumn: "ItemId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_vendor_quotation_lines_vendor_quotations_QuotationId",
-                        column: x => x.QuotationId,
-                        principalTable: "vendor_quotations",
-                        principalColumn: "QuotationId",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "purchase_return_lines",
-                columns: table => new
-                {
-                    ReturnLineId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    ReturnId = table.Column<int>(type: "integer", nullable: false),
-                    GrnLineId = table.Column<int>(type: "integer", nullable: true),
-                    ItemId = table.Column<int>(type: "integer", nullable: false),
-                    Qty = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_purchase_return_lines", x => x.ReturnLineId);
-                    table.ForeignKey(
-                        name: "FK_purchase_return_lines_grn_lines_GrnLineId",
-                        column: x => x.GrnLineId,
-                        principalTable: "grn_lines",
-                        principalColumn: "GrnLineId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_purchase_return_lines_items_ItemId",
-                        column: x => x.ItemId,
-                        principalTable: "items",
-                        principalColumn: "ItemId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_purchase_return_lines_purchase_returns_ReturnId",
-                        column: x => x.ReturnId,
-                        principalTable: "purchase_returns",
-                        principalColumn: "ReturnId",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "stock_layers",
-                columns: table => new
-                {
-                    LayerId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    ItemId = table.Column<int>(type: "integer", nullable: false),
-                    WarehouseId = table.Column<int>(type: "integer", nullable: false),
-                    BatchId = table.Column<int>(type: "integer", nullable: true),
-                    SerialId = table.Column<int>(type: "integer", nullable: true),
-                    GrnLineId = table.Column<int>(type: "integer", nullable: true),
-                    QtyReceived = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
-                    QtyRemaining = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
-                    UnitCost = table.Column<decimal>(type: "numeric(18,6)", precision: 18, scale: 6, nullable: false),
-                    ReceiptDate = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_stock_layers", x => x.LayerId);
-                    table.ForeignKey(
-                        name: "FK_stock_layers_batches_BatchId",
-                        column: x => x.BatchId,
-                        principalTable: "batches",
-                        principalColumn: "BatchId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_layers_grn_lines_GrnLineId",
-                        column: x => x.GrnLineId,
-                        principalTable: "grn_lines",
-                        principalColumn: "GrnLineId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_layers_items_ItemId",
-                        column: x => x.ItemId,
-                        principalTable: "items",
-                        principalColumn: "ItemId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_layers_serials_SerialId",
-                        column: x => x.SerialId,
-                        principalTable: "serials",
-                        principalColumn: "SerialId",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_stock_layers_warehouses_WarehouseId",
-                        column: x => x.WarehouseId,
-                        principalTable: "warehouses",
-                        principalColumn: "WarehouseId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.InsertData(
-                table: "users",
-                columns: new[] { "UserId", "auth_user_id", "DisplayName", "Status", "Username" },
-                values: new object[] { 1, null, "System", "Active", "system" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_audit_logs_CreatedAt",
-                table: "audit_logs",
-                column: "CreatedAt");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_audit_logs_EntityType_EntityId",
-                table: "audit_logs",
-                columns: new[] { "EntityType", "EntityId" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_audit_logs_UserId",
-                table: "audit_logs",
-                column: "UserId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_batches_ItemId_BatchNo",
-                table: "batches",
-                columns: new[] { "ItemId", "BatchNo" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_bins_WarehouseId_Code",
-                table: "bins",
-                columns: new[] { "WarehouseId", "Code" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_categories_ParentId",
-                table: "categories",
-                column: "ParentId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_grn_lines_BatchId",
-                table: "grn_lines",
-                column: "BatchId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_grn_lines_BinId",
-                table: "grn_lines",
-                column: "BinId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_grn_lines_GrnId",
-                table: "grn_lines",
-                column: "GrnId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_grn_lines_ItemId",
-                table: "grn_lines",
-                column: "ItemId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_grn_lines_PoLineId",
-                table: "grn_lines",
-                column: "PoLineId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_grn_lines_UomId",
-                table: "grn_lines",
-                column: "UomId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_grns_CreatedBy",
-                table: "grns",
-                column: "CreatedBy");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_grns_DocNo",
-                table: "grns",
-                column: "DocNo",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_grns_PoId",
-                table: "grns",
-                column: "PoId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_grns_Status",
-                table: "grns",
-                column: "Status");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_grns_VendorId",
-                table: "grns",
-                column: "VendorId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_grns_WarehouseId",
-                table: "grns",
-                column: "WarehouseId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_item_reorders_ItemId_WarehouseId",
-                table: "item_reorders",
-                columns: new[] { "ItemId", "WarehouseId" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_item_reorders_WarehouseId",
-                table: "item_reorders",
-                column: "WarehouseId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_items_BaseUomId",
-                table: "items",
-                column: "BaseUomId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_items_CategoryId",
-                table: "items",
-                column: "CategoryId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_items_DefaultVendorId",
-                table: "items",
-                column: "DefaultVendorId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_items_Sku",
-                table: "items",
-                column: "Sku",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_items_Status",
-                table: "items",
-                column: "Status");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_journal_entry_stubs_SourceDocType_SourceDocId",
-                table: "journal_entry_stubs",
-                columns: new[] { "SourceDocType", "SourceDocId" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_number_sequences_doc_type_year",
-                table: "number_sequences",
-                columns: new[] { "doc_type", "year" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_po_lines_ItemId",
-                table: "po_lines",
-                column: "ItemId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_po_lines_PoId",
-                table: "po_lines",
-                column: "PoId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_po_lines_UomId",
-                table: "po_lines",
-                column: "UomId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_po_lines_WarehouseId",
-                table: "po_lines",
-                column: "WarehouseId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_purchase_orders_CreatedBy",
-                table: "purchase_orders",
-                column: "CreatedBy");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_purchase_orders_DocNo",
-                table: "purchase_orders",
-                column: "DocNo",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_purchase_orders_RequisitionId",
-                table: "purchase_orders",
-                column: "RequisitionId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_purchase_orders_Status",
-                table: "purchase_orders",
-                column: "Status");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_purchase_orders_VendorId",
-                table: "purchase_orders",
-                column: "VendorId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_purchase_return_lines_GrnLineId",
-                table: "purchase_return_lines",
-                column: "GrnLineId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_purchase_return_lines_ItemId",
-                table: "purchase_return_lines",
-                column: "ItemId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_purchase_return_lines_ReturnId",
-                table: "purchase_return_lines",
-                column: "ReturnId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_purchase_returns_CreatedBy",
-                table: "purchase_returns",
-                column: "CreatedBy");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_purchase_returns_DocNo",
-                table: "purchase_returns",
-                column: "DocNo",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_purchase_returns_ReasonCodeId",
-                table: "purchase_returns",
-                column: "ReasonCodeId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_purchase_returns_VendorId",
-                table: "purchase_returns",
-                column: "VendorId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_purchase_returns_WarehouseId",
-                table: "purchase_returns",
-                column: "WarehouseId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_reason_codes_Context_Code",
-                table: "reason_codes",
-                columns: new[] { "Context", "Code" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_requisition_lines_ItemId",
-                table: "requisition_lines",
-                column: "ItemId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_requisition_lines_RequisitionId",
-                table: "requisition_lines",
-                column: "RequisitionId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_requisitions_DocNo",
-                table: "requisitions",
-                column: "DocNo",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_requisitions_RequestedBy",
-                table: "requisitions",
-                column: "RequestedBy");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_requisitions_Status",
-                table: "requisitions",
-                column: "Status");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_rfq_lines_ItemId",
-                table: "rfq_lines",
-                column: "ItemId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_rfq_lines_RfqId",
-                table: "rfq_lines",
-                column: "RfqId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_rfqs_DocNo",
-                table: "rfqs",
-                column: "DocNo",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_rfqs_RequisitionId",
-                table: "rfqs",
-                column: "RequisitionId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_serials_ItemId_SerialNo",
-                table: "serials",
-                columns: new[] { "ItemId", "SerialNo" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_adjustment_lines_AdjustmentId",
-                table: "stock_adjustment_lines",
-                column: "AdjustmentId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_adjustment_lines_BatchId",
-                table: "stock_adjustment_lines",
-                column: "BatchId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_adjustment_lines_BinId",
-                table: "stock_adjustment_lines",
-                column: "BinId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_adjustment_lines_ItemId",
-                table: "stock_adjustment_lines",
-                column: "ItemId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_adjustment_lines_SerialId",
-                table: "stock_adjustment_lines",
-                column: "SerialId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_adjustments_CreatedBy",
-                table: "stock_adjustments",
-                column: "CreatedBy");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_adjustments_DocNo",
-                table: "stock_adjustments",
-                column: "DocNo",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_adjustments_ReasonCodeId",
-                table: "stock_adjustments",
-                column: "ReasonCodeId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_adjustments_WarehouseId",
-                table: "stock_adjustments",
-                column: "WarehouseId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_count_lines_BinId",
-                table: "stock_count_lines",
-                column: "BinId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_count_lines_CountId",
-                table: "stock_count_lines",
-                column: "CountId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_count_lines_ItemId",
-                table: "stock_count_lines",
-                column: "ItemId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_counts_CreatedBy",
-                table: "stock_counts",
-                column: "CreatedBy");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_counts_DocNo",
-                table: "stock_counts",
-                column: "DocNo",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_counts_Status",
-                table: "stock_counts",
-                column: "Status");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_counts_WarehouseId",
-                table: "stock_counts",
-                column: "WarehouseId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_layers_BatchId",
-                table: "stock_layers",
-                column: "BatchId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_layers_GrnLineId",
-                table: "stock_layers",
-                column: "GrnLineId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_layers_ItemId_WarehouseId_ReceiptDate_LayerId",
-                table: "stock_layers",
-                columns: new[] { "ItemId", "WarehouseId", "ReceiptDate", "LayerId" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_layers_SerialId",
-                table: "stock_layers",
-                column: "SerialId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_layers_WarehouseId",
-                table: "stock_layers",
-                column: "WarehouseId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_ledger_BatchId",
-                table: "stock_ledger",
-                column: "BatchId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_ledger_BinId",
-                table: "stock_ledger",
-                column: "BinId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_ledger_ItemId_WarehouseId_CreatedAt",
-                table: "stock_ledger",
-                columns: new[] { "ItemId", "WarehouseId", "CreatedAt" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_ledger_ItemId_WarehouseId_LedgerId",
-                table: "stock_ledger",
-                columns: new[] { "ItemId", "WarehouseId", "LedgerId" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_ledger_SerialId",
-                table: "stock_ledger",
-                column: "SerialId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_ledger_SourceDocType_SourceDocId",
-                table: "stock_ledger",
-                columns: new[] { "SourceDocType", "SourceDocId" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_ledger_UserId",
-                table: "stock_ledger",
-                column: "UserId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_ledger_WarehouseId",
-                table: "stock_ledger",
-                column: "WarehouseId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_transfer_lines_BatchId",
-                table: "stock_transfer_lines",
-                column: "BatchId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_transfer_lines_DestBinId",
-                table: "stock_transfer_lines",
-                column: "DestBinId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_transfer_lines_ItemId",
-                table: "stock_transfer_lines",
-                column: "ItemId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_transfer_lines_SerialId",
-                table: "stock_transfer_lines",
-                column: "SerialId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_transfer_lines_SrcBinId",
-                table: "stock_transfer_lines",
-                column: "SrcBinId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_transfer_lines_TransferId",
-                table: "stock_transfer_lines",
-                column: "TransferId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_transfers_CreatedBy",
-                table: "stock_transfers",
-                column: "CreatedBy");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_transfers_DestWarehouseId",
-                table: "stock_transfers",
-                column: "DestWarehouseId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_transfers_DocNo",
-                table: "stock_transfers",
-                column: "DocNo",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_transfers_SrcWarehouseId",
-                table: "stock_transfers",
-                column: "SrcWarehouseId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_stock_transfers_Status",
-                table: "stock_transfers",
-                column: "Status");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_uom_conversions_FromUomId",
-                table: "uom_conversions",
-                column: "FromUomId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_uom_conversions_ItemId_FromUomId_ToUomId",
-                table: "uom_conversions",
-                columns: new[] { "ItemId", "FromUomId", "ToUomId" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_uom_conversions_ToUomId",
-                table: "uom_conversions",
-                column: "ToUomId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_uoms_Name",
-                table: "uoms",
-                column: "Name",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_users_auth_user_id",
-                table: "users",
-                column: "auth_user_id",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_users_Username",
-                table: "users",
-                column: "Username",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_vendor_quotation_lines_ItemId",
-                table: "vendor_quotation_lines",
-                column: "ItemId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_vendor_quotation_lines_QuotationId",
-                table: "vendor_quotation_lines",
-                column: "QuotationId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_vendor_quotations_RfqId_VendorId",
-                table: "vendor_quotations",
-                columns: new[] { "RfqId", "VendorId" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_vendor_quotations_VendorId",
-                table: "vendor_quotations",
-                column: "VendorId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_vendors_Code",
-                table: "vendors",
-                column: "Code",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_vendors_Status",
-                table: "vendors",
-                column: "Status");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_warehouses_Code",
-                table: "warehouses",
-                column: "Code",
-                unique: true);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "audit_logs");
-
-            migrationBuilder.DropTable(
-                name: "item_reorders");
-
-            migrationBuilder.DropTable(
-                name: "journal_entry_stubs");
-
-            migrationBuilder.DropTable(
-                name: "number_sequences");
-
-            migrationBuilder.DropTable(
-                name: "purchase_return_lines");
-
-            migrationBuilder.DropTable(
-                name: "requisition_lines");
-
-            migrationBuilder.DropTable(
-                name: "rfq_lines");
-
-            migrationBuilder.DropTable(
-                name: "stock_adjustment_lines");
-
-            migrationBuilder.DropTable(
-                name: "stock_count_lines");
-
-            migrationBuilder.DropTable(
-                name: "stock_layers");
-
-            migrationBuilder.DropTable(
-                name: "stock_ledger");
-
-            migrationBuilder.DropTable(
-                name: "stock_transfer_lines");
-
-            migrationBuilder.DropTable(
-                name: "uom_conversions");
-
-            migrationBuilder.DropTable(
-                name: "vendor_quotation_lines");
-
-            migrationBuilder.DropTable(
-                name: "purchase_returns");
-
-            migrationBuilder.DropTable(
-                name: "stock_adjustments");
-
-            migrationBuilder.DropTable(
-                name: "stock_counts");
-
-            migrationBuilder.DropTable(
-                name: "grn_lines");
-
-            migrationBuilder.DropTable(
-                name: "serials");
-
-            migrationBuilder.DropTable(
-                name: "stock_transfers");
-
-            migrationBuilder.DropTable(
-                name: "vendor_quotations");
-
-            migrationBuilder.DropTable(
-                name: "reason_codes");
-
-            migrationBuilder.DropTable(
-                name: "batches");
-
-            migrationBuilder.DropTable(
-                name: "bins");
-
-            migrationBuilder.DropTable(
-                name: "grns");
-
-            migrationBuilder.DropTable(
-                name: "po_lines");
-
-            migrationBuilder.DropTable(
-                name: "rfqs");
-
-            migrationBuilder.DropTable(
-                name: "items");
-
-            migrationBuilder.DropTable(
-                name: "purchase_orders");
-
-            migrationBuilder.DropTable(
-                name: "warehouses");
-
-            migrationBuilder.DropTable(
-                name: "categories");
-
-            migrationBuilder.DropTable(
-                name: "uoms");
-
-            migrationBuilder.DropTable(
-                name: "requisitions");
-
-            migrationBuilder.DropTable(
-                name: "vendors");
-
-            migrationBuilder.DropTable(
-                name: "users");
-        }
-    }
-}
diff --git a/Backend/ERPCore/Infra/Persistence/Migrations/20260716134938_AddBrandsSubcategoriesItemTypesAndProductConfig.Designer.cs b/Backend/ERPCore/Infra/Persistence/Migrations/20260716134938_AddBrandsSubcategoriesItemTypesAndProductConfig.Designer.cs
deleted file mode 100644
index 829393d..0000000
--- a/Backend/ERPCore/Infra/Persistence/Migrations/20260716134938_AddBrandsSubcategoriesItemTypesAndProductConfig.Designer.cs
+++ /dev/null
@@ -1,2454 +0,0 @@
-// <auto-generated />
-using System;
-using ERPCore.Infra.Persistence;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace ERPCore.Infra.Persistence.Migrations
-{
-    [DbContext(typeof(ErpDbContext))]
-    [Migration("20260716134938_AddBrandsSubcategoriesItemTypesAndProductConfig")]
-    partial class AddBrandsSubcategoriesItemTypesAndProductConfig
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.9")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.AuditLog", b =>
-                {
-                    b.Property<int>("AuditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("AuditId"));
-
-                    b.Property<string>("Action")
-                        .IsRequired()
-                        .HasMaxLength(10)
-                        .HasColumnType("character varying(10)");
-
-                    b.Property<string>("ChangeSet")
-                        .IsRequired()
-                        .HasColumnType("jsonb");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("EntityId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("EntityType")
-                        .IsRequired()
-                        .HasMaxLength(80)
-                        .HasColumnType("character varying(80)");
-
-                    b.Property<int>("UserId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("AuditId");
-
-                    b.HasIndex("CreatedAt");
-
-                    b.HasIndex("UserId");
-
-                    b.HasIndex("EntityType", "EntityId");
-
-                    b.ToTable("audit_logs", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Batch", b =>
-                {
-                    b.Property<int>("BatchId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("BatchId"));
-
-                    b.Property<string>("BatchNo")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<DateOnly?>("ExpiryDate")
-                        .HasColumnType("date");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("BatchId");
-
-                    b.HasIndex("ItemId", "BatchNo")
-                        .IsUnique();
-
-                    b.ToTable("batches", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Bin", b =>
-                {
-                    b.Property<int>("BinId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("BinId"));
-
-                    b.Property<string>("BinType")
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("BinId");
-
-                    b.HasIndex("WarehouseId", "Code")
-                        .IsUnique();
-
-                    b.ToTable("bins", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Brand", b =>
-                {
-                    b.Property<int>("BrandId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("BrandId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("BrandId");
-
-                    b.HasIndex("Name")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("brands", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Category", b =>
-                {
-                    b.Property<int>("CategoryId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CategoryId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("CategoryId");
-
-                    b.HasIndex("Name")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("categories", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Grn", b =>
-                {
-                    b.Property<int>("GrnId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GrnId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int?>("PoId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime?>("PostedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("VendorId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("GrnId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("PoId");
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("VendorId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("grns", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.GrnLine", b =>
-                {
-                    b.Property<int>("GrnLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GrnLineId"));
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("GrnId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("HoldStatus")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("PoLineId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("ReceivedValue")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("UnitCost")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.Property<int>("UomId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("GrnLineId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("BinId");
-
-                    b.HasIndex("GrnId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("PoLineId");
-
-                    b.HasIndex("UomId");
-
-                    b.ToTable("grn_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Item", b =>
-                {
-                    b.Property<int>("ItemId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ItemId"));
-
-                    b.Property<int>("BaseUomId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BrandId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("CategoryId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int?>("DefaultVendorId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Description")
-                        .HasMaxLength(1000)
-                        .HasColumnType("character varying(1000)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Sku")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<string>("StockNature")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int?>("SubCategoryId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("TaxClass")
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("TrackingMode")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("ItemId");
-
-                    b.HasIndex("BaseUomId");
-
-                    b.HasIndex("BrandId");
-
-                    b.HasIndex("CategoryId");
-
-                    b.HasIndex("DefaultVendorId");
-
-                    b.HasIndex("Sku")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("SubCategoryId");
-
-                    b.ToTable("items", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ItemReorder", b =>
-                {
-                    b.Property<int>("ReorderId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReorderId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("ReorderPoint")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("ReorderQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ReorderId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.HasIndex("ItemId", "WarehouseId")
-                        .IsUnique();
-
-                    b.ToTable("item_reorders", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ItemType", b =>
-                {
-                    b.Property<int>("ItemTypeId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ItemTypeId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("ItemTypeId");
-
-                    b.HasIndex("Name")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("item_types", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.JournalEntryStub", b =>
-                {
-                    b.Property<int>("JournalId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("JournalId"));
-
-                    b.Property<decimal>("Amount")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<string>("CreditAccount")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("DebitAccount")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("SourceDocId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("SourceDocType")
-                        .IsRequired()
-                        .HasMaxLength(10)
-                        .HasColumnType("character varying(10)");
-
-                    b.HasKey("JournalId");
-
-                    b.HasIndex("SourceDocType", "SourceDocId");
-
-                    b.ToTable("journal_entry_stubs", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.NumberSequence", b =>
-                {
-                    b.Property<int>("SequenceId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("SequenceId"));
-
-                    b.Property<string>("DocType")
-                        .IsRequired()
-                        .HasMaxLength(10)
-                        .HasColumnType("character varying(10)")
-                        .HasColumnName("doc_type");
-
-                    b.Property<int>("LastNumber")
-                        .HasColumnType("integer")
-                        .HasColumnName("last_number");
-
-                    b.Property<int>("Year")
-                        .HasColumnType("integer")
-                        .HasColumnName("year");
-
-                    b.HasKey("SequenceId");
-
-                    b.HasIndex("DocType", "Year")
-                        .IsUnique();
-
-                    b.ToTable("number_sequences", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PoLine", b =>
-                {
-                    b.Property<int>("PoLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("PoLineId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("PoId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("QtyReceived")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("Tax")
-                        .HasPrecision(9, 4)
-                        .HasColumnType("numeric(9,4)");
-
-                    b.Property<decimal>("UnitPrice")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("UomId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("PoLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("PoId");
-
-                    b.HasIndex("UomId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("po_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ProductConfig", b =>
-                {
-                    b.Property<int>("ConfigId")
-                        .HasColumnType("integer");
-
-                    b.Property<bool>("BrandsEnabled")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("boolean")
-                        .HasDefaultValue(true);
-
-                    b.Property<bool>("ItemTypesEnabled")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("boolean")
-                        .HasDefaultValue(true);
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<bool>("SubcategoriesEnabled")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("boolean")
-                        .HasDefaultValue(true);
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int?>("UpdatedBy")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ConfigId");
-
-                    b.HasIndex("UpdatedBy");
-
-                    b.ToTable("product_config", null, t =>
-                        {
-                            t.HasCheckConstraint("ck_product_config_singleton", "\"ConfigId\" = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseOrder", b =>
-                {
-                    b.Property<int>("PoId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("PoId"));
-
-                    b.Property<bool>("ApprovalRequired")
-                        .HasColumnType("boolean");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int?>("RequisitionId")
-                        .HasColumnType("integer");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("VendorId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("PoId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("RequisitionId");
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("VendorId");
-
-                    b.ToTable("purchase_orders", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturn", b =>
-                {
-                    b.Property<int>("ReturnId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReturnId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int>("ReasonCodeId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("VendorId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ReturnId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("ReasonCodeId");
-
-                    b.HasIndex("VendorId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("purchase_returns", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturnLine", b =>
-                {
-                    b.Property<int>("ReturnLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReturnLineId"));
-
-                    b.Property<int?>("GrnLineId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("ReturnId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ReturnLineId");
-
-                    b.HasIndex("GrnLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("ReturnId");
-
-                    b.ToTable("purchase_return_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ReasonCode", b =>
-                {
-                    b.Property<int>("ReasonCodeId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReasonCodeId"));
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("Context")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.HasKey("ReasonCodeId");
-
-                    b.HasIndex("Context", "Code")
-                        .IsUnique();
-
-                    b.ToTable("reason_codes", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Requisition", b =>
-                {
-                    b.Property<int>("RequisitionId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RequisitionId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int>("RequestedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("RequisitionId");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("RequestedBy");
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("requisitions", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RequisitionLine", b =>
-                {
-                    b.Property<int>("ReqLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReqLineId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<DateOnly?>("RequiredBy")
-                        .HasColumnType("date");
-
-                    b.Property<int>("RequisitionId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ReqLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("RequisitionId");
-
-                    b.ToTable("requisition_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Rfq", b =>
-                {
-                    b.Property<int>("RfqId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RfqId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int>("RequisitionId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("RfqId");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("RequisitionId");
-
-                    b.ToTable("rfqs", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RfqLine", b =>
-                {
-                    b.Property<int>("RfqLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RfqLineId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("RfqId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("RfqLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("RfqId");
-
-                    b.ToTable("rfq_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Serial", b =>
-                {
-                    b.Property<int>("SerialId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("SerialId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("SerialNo")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("character varying(100)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("SerialId");
-
-                    b.HasIndex("ItemId", "SerialNo")
-                        .IsUnique();
-
-                    b.ToTable("serials", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustment", b =>
-                {
-                    b.Property<int>("AdjustmentId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("AdjustmentId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int>("ReasonCodeId")
-                        .HasColumnType("integer");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("AdjustmentId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("ReasonCodeId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("stock_adjustments", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustmentLine", b =>
-                {
-                    b.Property<int>("AdjLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("AdjLineId"));
-
-                    b.Property<int>("AdjustmentId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("QtyDelta")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int?>("SerialId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("AdjLineId");
-
-                    b.HasIndex("AdjustmentId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("BinId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("SerialId");
-
-                    b.ToTable("stock_adjustment_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCount", b =>
-                {
-                    b.Property<int>("CountId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CountId"));
-
-                    b.Property<string>("CountType")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("CountId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("stock_counts", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCountLine", b =>
-                {
-                    b.Property<int>("CountLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CountLineId"));
-
-                    b.Property<int?>("BinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("CountId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal?>("CountedQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("SystemQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal?>("Variance")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.HasKey("CountLineId");
-
-                    b.HasIndex("BinId");
-
-                    b.HasIndex("CountId");
-
-                    b.HasIndex("ItemId");
-
-                    b.ToTable("stock_count_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockLayer", b =>
-                {
-                    b.Property<int>("LayerId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("LayerId"));
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("GrnLineId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("QtyReceived")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("QtyRemaining")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<DateTime>("ReceiptDate")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int?>("SerialId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("UnitCost")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("LayerId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("GrnLineId");
-
-                    b.HasIndex("SerialId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.HasIndex("ItemId", "WarehouseId", "ReceiptDate", "LayerId");
-
-                    b.ToTable("stock_layers", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockLedger", b =>
-                {
-                    b.Property<int>("LedgerId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("LedgerId"));
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BinId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Direction")
-                        .IsRequired()
-                        .HasMaxLength(5)
-                        .HasColumnType("character varying(5)");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("QtyBase")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("RunningBalance")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int?>("SerialId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("SourceDocId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("SourceDocType")
-                        .IsRequired()
-                        .HasMaxLength(10)
-                        .HasColumnType("character varying(10)");
-
-                    b.Property<decimal>("UnitCost")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.Property<int>("UserId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Value")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("LedgerId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("BinId");
-
-                    b.HasIndex("SerialId");
-
-                    b.HasIndex("UserId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.HasIndex("SourceDocType", "SourceDocId");
-
-                    b.HasIndex("ItemId", "WarehouseId", "CreatedAt");
-
-                    b.HasIndex("ItemId", "WarehouseId", "LedgerId");
-
-                    b.ToTable("stock_ledger", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransfer", b =>
-                {
-                    b.Property<int>("TransferId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TransferId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("DestWarehouseId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<int>("SrcWarehouseId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("TransferId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DestWarehouseId");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("SrcWarehouseId");
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("stock_transfers", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransferLine", b =>
-                {
-                    b.Property<int>("TransferLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TransferLineId"));
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("DestBinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("QtyReceived")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int?>("SerialId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("SrcBinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("TransferId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal?>("UnitCost")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.HasKey("TransferLineId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("DestBinId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("SerialId");
-
-                    b.HasIndex("SrcBinId");
-
-                    b.HasIndex("TransferId");
-
-                    b.ToTable("stock_transfer_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.SubCategory", b =>
-                {
-                    b.Property<int>("SubCategoryId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("SubCategoryId"));
-
-                    b.Property<int>("CategoryId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("SubCategoryId");
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("CategoryId", "Name")
-                        .IsUnique();
-
-                    b.ToTable("subcategories", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Uom", b =>
-                {
-                    b.Property<int>("UomId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("UomId"));
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.HasKey("UomId");
-
-                    b.HasIndex("Name")
-                        .IsUnique();
-
-                    b.ToTable("uoms", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.UomConversion", b =>
-                {
-                    b.Property<int>("ConversionId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ConversionId"));
-
-                    b.Property<decimal>("Factor")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.Property<int>("FromUomId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ToUomId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ConversionId");
-
-                    b.HasIndex("FromUomId");
-
-                    b.HasIndex("ToUomId");
-
-                    b.HasIndex("ItemId", "FromUomId", "ToUomId")
-                        .IsUnique();
-
-                    b.ToTable("uom_conversions", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.User", b =>
-                {
-                    b.Property<int>("UserId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("UserId"));
-
-                    b.Property<Guid?>("AuthUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("auth_user_id");
-
-                    b.Property<string>("DisplayName")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("Username")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("character varying(100)");
-
-                    b.HasKey("UserId");
-
-                    b.HasIndex("AuthUserId")
-                        .IsUnique();
-
-                    b.HasIndex("Username")
-                        .IsUnique();
-
-                    b.ToTable("users", (string)null);
-
-                    b.HasData(
-                        new
-                        {
-                            UserId = 1,
-                            DisplayName = "System",
-                            Status = "Active",
-                            Username = "system"
-                        });
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Vendor", b =>
-                {
-                    b.Property<int>("VendorId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("VendorId"));
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Currency")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(3)
-                        .HasColumnType("character varying(3)")
-                        .HasDefaultValue("LKR");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<string>("TaxReg")
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Terms")
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("VendorId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("vendors", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotation", b =>
-                {
-                    b.Property<int>("QuotationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("QuotationId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("RfqId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("VendorId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("QuotationId");
-
-                    b.HasIndex("VendorId");
-
-                    b.HasIndex("RfqId", "VendorId")
-                        .IsUnique();
-
-                    b.ToTable("vendor_quotations", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotationLine", b =>
-                {
-                    b.Property<int>("QuotationLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("QuotationLineId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("LeadDays")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("QuotationId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("UnitPrice")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.HasKey("QuotationLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("QuotationId");
-
-                    b.ToTable("vendor_quotation_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Warehouse", b =>
-                {
-                    b.Property<int>("WarehouseId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("WarehouseId"));
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.HasKey("WarehouseId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.ToTable("warehouses", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.AuditLog", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Batch", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Bin", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany("Bins")
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Grn", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.PurchaseOrder", "PurchaseOrder")
-                        .WithMany()
-                        .HasForeignKey("PoId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "Vendor")
-                        .WithMany()
-                        .HasForeignKey("VendorId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("PurchaseOrder");
-
-                    b.Navigation("Vendor");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.GrnLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Batch", "Batch")
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", "Bin")
-                        .WithMany()
-                        .HasForeignKey("BinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Grn", "Grn")
-                        .WithMany("Lines")
-                        .HasForeignKey("GrnId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.PoLine", "PoLine")
-                        .WithMany()
-                        .HasForeignKey("PoLineId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
-                        .WithMany()
-                        .HasForeignKey("UomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Batch");
-
-                    b.Navigation("Bin");
-
-                    b.Navigation("Grn");
-
-                    b.Navigation("Item");
-
-                    b.Navigation("PoLine");
-
-                    b.Navigation("Uom");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Item", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "BaseUom")
-                        .WithMany()
-                        .HasForeignKey("BaseUomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Brand", "Brand")
-                        .WithMany()
-                        .HasForeignKey("BrandId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Category", "Category")
-                        .WithMany()
-                        .HasForeignKey("CategoryId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "DefaultVendor")
-                        .WithMany()
-                        .HasForeignKey("DefaultVendorId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.SubCategory", "SubCategory")
-                        .WithMany()
-                        .HasForeignKey("SubCategoryId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("BaseUom");
-
-                    b.Navigation("Brand");
-
-                    b.Navigation("Category");
-
-                    b.Navigation("DefaultVendor");
-
-                    b.Navigation("SubCategory");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ItemReorder", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany("ReorderSettings")
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PoLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.PurchaseOrder", "PurchaseOrder")
-                        .WithMany("Lines")
-                        .HasForeignKey("PoId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
-                        .WithMany()
-                        .HasForeignKey("UomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("PurchaseOrder");
-
-                    b.Navigation("Uom");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ProductConfig", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "UpdatedByUser")
-                        .WithMany()
-                        .HasForeignKey("UpdatedBy")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("UpdatedByUser");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseOrder", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Requisition", "Requisition")
-                        .WithMany()
-                        .HasForeignKey("RequisitionId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "Vendor")
-                        .WithMany()
-                        .HasForeignKey("VendorId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("Requisition");
-
-                    b.Navigation("Vendor");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturn", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.ReasonCode", "ReasonCode")
-                        .WithMany()
-                        .HasForeignKey("ReasonCodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "Vendor")
-                        .WithMany()
-                        .HasForeignKey("VendorId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("ReasonCode");
-
-                    b.Navigation("Vendor");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturnLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.GrnLine", "GrnLine")
-                        .WithMany()
-                        .HasForeignKey("GrnLineId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.PurchaseReturn", "Return")
-                        .WithMany("Lines")
-                        .HasForeignKey("ReturnId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("GrnLine");
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Return");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Requisition", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Requester")
-                        .WithMany()
-                        .HasForeignKey("RequestedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Requester");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RequisitionLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Requisition", "Requisition")
-                        .WithMany("Lines")
-                        .HasForeignKey("RequisitionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Requisition");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Rfq", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Requisition", "Requisition")
-                        .WithMany()
-                        .HasForeignKey("RequisitionId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Requisition");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RfqLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Rfq", "Rfq")
-                        .WithMany("Lines")
-                        .HasForeignKey("RfqId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Rfq");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Serial", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustment", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.ReasonCode", "ReasonCode")
-                        .WithMany()
-                        .HasForeignKey("ReasonCodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("ReasonCode");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustmentLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.StockAdjustment", "Adjustment")
-                        .WithMany("Lines")
-                        .HasForeignKey("AdjustmentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Batch", null)
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("BinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Serial", null)
-                        .WithMany()
-                        .HasForeignKey("SerialId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("Adjustment");
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCount", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCountLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("BinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.StockCount", "Count")
-                        .WithMany("Lines")
-                        .HasForeignKey("CountId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Count");
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockLayer", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Batch", "Batch")
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.GrnLine", "GrnLine")
-                        .WithMany()
-                        .HasForeignKey("GrnLineId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Serial", "Serial")
-                        .WithMany()
-                        .HasForeignKey("SerialId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Batch");
-
-                    b.Navigation("GrnLine");
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Serial");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockLedger", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Batch", null)
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("BinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", null)
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Serial", null)
-                        .WithMany()
-                        .HasForeignKey("SerialId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.User", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", null)
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransfer", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "DestWarehouse")
-                        .WithMany()
-                        .HasForeignKey("DestWarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "SrcWarehouse")
-                        .WithMany()
-                        .HasForeignKey("SrcWarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("DestWarehouse");
-
-                    b.Navigation("SrcWarehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransferLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Batch", null)
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("DestBinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Serial", null)
-                        .WithMany()
-                        .HasForeignKey("SerialId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("SrcBinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.StockTransfer", "Transfer")
-                        .WithMany("Lines")
-                        .HasForeignKey("TransferId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Transfer");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.SubCategory", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Category", "Category")
-                        .WithMany("SubCategories")
-                        .HasForeignKey("CategoryId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Category");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.UomConversion", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "FromUom")
-                        .WithMany()
-                        .HasForeignKey("FromUomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany("UomConversions")
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "ToUom")
-                        .WithMany()
-                        .HasForeignKey("ToUomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("FromUom");
-
-                    b.Navigation("Item");
-
-                    b.Navigation("ToUom");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotation", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Rfq", "Rfq")
-                        .WithMany("Quotations")
-                        .HasForeignKey("RfqId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "Vendor")
-                        .WithMany()
-                        .HasForeignKey("VendorId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Rfq");
-
-                    b.Navigation("Vendor");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotationLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.VendorQuotation", "Quotation")
-                        .WithMany("Lines")
-                        .HasForeignKey("QuotationId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Quotation");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Category", b =>
-                {
-                    b.Navigation("SubCategories");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Grn", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Item", b =>
-                {
-                    b.Navigation("ReorderSettings");
-
-                    b.Navigation("UomConversions");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseOrder", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturn", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Requisition", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Rfq", b =>
-                {
-                    b.Navigation("Lines");
-
-                    b.Navigation("Quotations");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustment", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCount", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransfer", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotation", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Warehouse", b =>
-                {
-                    b.Navigation("Bins");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/Backend/ERPCore/Infra/Persistence/Migrations/20260716134938_AddBrandsSubcategoriesItemTypesAndProductConfig.cs b/Backend/ERPCore/Infra/Persistence/Migrations/20260716134938_AddBrandsSubcategoriesItemTypesAndProductConfig.cs
deleted file mode 100644
index a7e0ac5..0000000
--- a/Backend/ERPCore/Infra/Persistence/Migrations/20260716134938_AddBrandsSubcategoriesItemTypesAndProductConfig.cs
+++ /dev/null
@@ -1,442 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace ERPCore.Infra.Persistence.Migrations
-{
-    /// <summary>
-    /// Adds the Brand / SubCategory / ItemType masters and the singleton product config,
-    /// and converts CATEGORY from a self-nesting tree into a fixed two-level
-    /// Category → SubCategory hierarchy (docs/10 Part C.1).
-    /// <para>
-    /// <b>This migration carries data, not just DDL.</b> The scaffolded version dropped
-    /// <c>categories.ParentId</c> outright, which would have silently flattened every
-    /// child category into a root and left items pointing at what is now a top-level
-    /// category — losing the parent entirely. The hand-written steps below (marked
-    /// "data migration") move child categories into <c>subcategories</c> and repoint items
-    /// onto the correct (category, subcategory) pair before the column goes away.
-    /// </para>
-    /// </summary>
-    public partial class AddBrandsSubcategoriesItemTypesAndProductConfig : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            // NOTE: the ParentId drop is deliberately deferred to the bottom of this method —
-            // the data migration reads it. Order here is load-bearing.
-            migrationBuilder.RenameColumn(
-                name: "ItemType",
-                table: "items",
-                newName: "StockNature");
-
-            migrationBuilder.AddColumn<int>(
-                name: "BrandId",
-                table: "items",
-                type: "integer",
-                nullable: true);
-
-            migrationBuilder.AddColumn<int>(
-                name: "SubCategoryId",
-                table: "items",
-                type: "integer",
-                nullable: true);
-
-            migrationBuilder.AddColumn<DateTime>(
-                name: "CreatedAt",
-                table: "categories",
-                type: "timestamp with time zone",
-                nullable: false,
-                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
-
-            migrationBuilder.AddColumn<string>(
-                name: "Status",
-                table: "categories",
-                type: "character varying(20)",
-                maxLength: 20,
-                nullable: false,
-                defaultValue: "Active");
-
-            migrationBuilder.AddColumn<DateTime>(
-                name: "UpdatedAt",
-                table: "categories",
-                type: "timestamp with time zone",
-                nullable: true);
-
-            migrationBuilder.AddColumn<uint>(
-                name: "xmin",
-                table: "categories",
-                type: "xid",
-                rowVersion: true,
-                nullable: false,
-                defaultValue: 0u);
-
-            migrationBuilder.CreateTable(
-                name: "brands",
-                columns: table => new
-                {
-                    BrandId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    Name = table.Column<string>(type: "character varying(200)", maxLength: 200, nullable: false),
-                    Status = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false, defaultValue: "Active"),
-                    CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
-                    UpdatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
-                    xmin = table.Column<uint>(type: "xid", rowVersion: true, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_brands", x => x.BrandId);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "item_types",
-                columns: table => new
-                {
-                    ItemTypeId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    Name = table.Column<string>(type: "character varying(200)", maxLength: 200, nullable: false),
-                    Status = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false, defaultValue: "Active"),
-                    CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
-                    UpdatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
-                    xmin = table.Column<uint>(type: "xid", rowVersion: true, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_item_types", x => x.ItemTypeId);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "product_config",
-                columns: table => new
-                {
-                    ConfigId = table.Column<int>(type: "integer", nullable: false),
-                    SubcategoriesEnabled = table.Column<bool>(type: "boolean", nullable: false, defaultValue: true),
-                    BrandsEnabled = table.Column<bool>(type: "boolean", nullable: false, defaultValue: true),
-                    ItemTypesEnabled = table.Column<bool>(type: "boolean", nullable: false, defaultValue: true),
-                    UpdatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
-                    UpdatedBy = table.Column<int>(type: "integer", nullable: true),
-                    xmin = table.Column<uint>(type: "xid", rowVersion: true, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_product_config", x => x.ConfigId);
-                    table.CheckConstraint("ck_product_config_singleton", "\"ConfigId\" = 1");
-                    table.ForeignKey(
-                        name: "FK_product_config_users_UpdatedBy",
-                        column: x => x.UpdatedBy,
-                        principalTable: "users",
-                        principalColumn: "UserId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "subcategories",
-                columns: table => new
-                {
-                    SubCategoryId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    Name = table.Column<string>(type: "character varying(200)", maxLength: 200, nullable: false),
-                    CategoryId = table.Column<int>(type: "integer", nullable: false),
-                    Status = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false, defaultValue: "Active"),
-                    CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
-                    UpdatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
-                    xmin = table.Column<uint>(type: "xid", rowVersion: true, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_subcategories", x => x.SubCategoryId);
-                    table.ForeignKey(
-                        name: "FK_subcategories_categories_CategoryId",
-                        column: x => x.CategoryId,
-                        principalTable: "categories",
-                        principalColumn: "CategoryId",
-                        onDelete: ReferentialAction.Restrict);
-                });
-
-            // ---------------------------------------------------------------------------
-            // DATA MIGRATION — must run before ParentId is dropped.
-            // ---------------------------------------------------------------------------
-
-            // Existing categories predate CreatedAt; the added column defaulted them to
-            // 0001-01-01. Stamp them with the migration time instead of a sentinel date.
-            migrationBuilder.Sql(@"
-                UPDATE categories SET ""CreatedAt"" = NOW() AT TIME ZONE 'utc';
-            ");
-
-            // Carry the old category id alongside each new subcategory so items can be
-            // repointed by join below. Dropped again once the repoint is done.
-            migrationBuilder.Sql(@"
-                ALTER TABLE subcategories ADD COLUMN legacy_category_id integer;
-            ");
-
-            // Walk the old tree to its roots. The previous model allowed unlimited nesting,
-            // but the new one is exactly two levels — so a category at any depth below the
-            // root collapses into a subcategory of its ROOT ancestor (a grandchild cannot
-            // become a subcategory of its immediate parent, since that parent is itself
-            // ceasing to be a category).
-            migrationBuilder.Sql(@"
-                WITH RECURSIVE tree AS (
-                    SELECT ""CategoryId"", ""ParentId"", ""Name"", ""CategoryId"" AS root_id
-                    FROM categories
-                    WHERE ""ParentId"" IS NULL
-                    UNION ALL
-                    SELECT c.""CategoryId"", c.""ParentId"", c.""Name"", t.root_id
-                    FROM categories c
-                    JOIN tree t ON c.""ParentId"" = t.""CategoryId""
-                )
-                INSERT INTO subcategories (""Name"", ""CategoryId"", ""Status"", ""CreatedAt"", legacy_category_id)
-                SELECT t.""Name"", t.root_id, 'Active', NOW() AT TIME ZONE 'utc', t.""CategoryId""
-                FROM tree t
-                WHERE t.""ParentId"" IS NOT NULL;
-            ");
-
-            // Repoint items: an item that pointed at a child category now carries the root
-            // category plus the subcategory it actually meant.
-            migrationBuilder.Sql(@"
-                UPDATE items i
-                SET ""SubCategoryId"" = s.""SubCategoryId"",
-                    ""CategoryId""    = s.""CategoryId""
-                FROM subcategories s
-                WHERE s.legacy_category_id = i.""CategoryId"";
-            ");
-
-            // The self-FK must go before the delete, or RESTRICT rejects removing a parent
-            // whose own child row is still present.
-            migrationBuilder.DropForeignKey(
-                name: "FK_categories_categories_ParentId",
-                table: "categories");
-
-            // Every non-root category now lives in `subcategories`, and no item references
-            // one any more (repointed above), so the rows can go.
-            migrationBuilder.Sql(@"
-                DELETE FROM categories WHERE ""ParentId"" IS NOT NULL;
-                ALTER TABLE subcategories DROP COLUMN legacy_category_id;
-            ");
-
-            migrationBuilder.DropIndex(
-                name: "IX_categories_ParentId",
-                table: "categories");
-
-            migrationBuilder.DropColumn(
-                name: "ParentId",
-                table: "categories");
-
-            // Seed the singleton config (FR-MD-11) — all features on. Item writes read this
-            // row, so it must exist before the app serves a single request.
-            migrationBuilder.Sql(@"
-                INSERT INTO product_config (""ConfigId"", ""SubcategoriesEnabled"", ""BrandsEnabled"", ""ItemTypesEnabled"")
-                VALUES (1, TRUE, TRUE, TRUE)
-                ON CONFLICT (""ConfigId"") DO NOTHING;
-            ");
-
-            // ---------------------------------------------------------------------------
-
-            migrationBuilder.CreateIndex(
-                name: "IX_items_BrandId",
-                table: "items",
-                column: "BrandId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_items_SubCategoryId",
-                table: "items",
-                column: "SubCategoryId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_categories_Name",
-                table: "categories",
-                column: "Name",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_categories_Status",
-                table: "categories",
-                column: "Status");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_brands_Name",
-                table: "brands",
-                column: "Name",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_brands_Status",
-                table: "brands",
-                column: "Status");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_item_types_Name",
-                table: "item_types",
-                column: "Name",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_item_types_Status",
-                table: "item_types",
-                column: "Status");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_product_config_UpdatedBy",
-                table: "product_config",
-                column: "UpdatedBy");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_subcategories_CategoryId_Name",
-                table: "subcategories",
-                columns: new[] { "CategoryId", "Name" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_subcategories_Status",
-                table: "subcategories",
-                column: "Status");
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_items_brands_BrandId",
-                table: "items",
-                column: "BrandId",
-                principalTable: "brands",
-                principalColumn: "BrandId",
-                onDelete: ReferentialAction.Restrict);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_items_subcategories_SubCategoryId",
-                table: "items",
-                column: "SubCategoryId",
-                principalTable: "subcategories",
-                principalColumn: "SubCategoryId",
-                onDelete: ReferentialAction.Restrict);
-        }
-
-        /// <summary>
-        /// Reverses the schema change and puts the subcategory data back where it came from.
-        /// <para>
-        /// The scaffolded version simply dropped <c>subcategories</c>, which would have
-        /// discarded exactly what <see cref="Up"/> preserved. Instead each subcategory is
-        /// restored as a child category and its items are repointed back onto it. This is
-        /// not perfectly lossless: the old tree's depth is gone (a former grandchild comes
-        /// back as a direct child of its root), and Brand data cannot survive a schema that
-        /// has nowhere to put it.
-        /// </para>
-        /// </summary>
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_items_brands_BrandId",
-                table: "items");
-
-            migrationBuilder.DropForeignKey(
-                name: "FK_items_subcategories_SubCategoryId",
-                table: "items");
-
-            // Restore the parent column + self-FK first so subcategories have somewhere to
-            // land, then move them back before the table is dropped.
-            migrationBuilder.AddColumn<int>(
-                name: "ParentId",
-                table: "categories",
-                type: "integer",
-                nullable: true);
-
-            // ---------------------------------------------------------------------------
-            // DATA MIGRATION (reverse) — must run before `subcategories` is dropped.
-            // ---------------------------------------------------------------------------
-
-            migrationBuilder.Sql(@"
-                ALTER TABLE categories ADD COLUMN legacy_subcategory_id integer;
-            ");
-
-            // Each subcategory becomes a child category again under the same parent.
-            migrationBuilder.Sql(@"
-                INSERT INTO categories (""Name"", ""ParentId"", ""CreatedAt"", ""Status"", legacy_subcategory_id)
-                SELECT s.""Name"", s.""CategoryId"", s.""CreatedAt"", s.""Status"", s.""SubCategoryId""
-                FROM subcategories s;
-            ");
-
-            // Items that carried a subcategory point back at the restored child category.
-            migrationBuilder.Sql(@"
-                UPDATE items i
-                SET ""CategoryId"" = c.""CategoryId""
-                FROM categories c
-                WHERE c.legacy_subcategory_id = i.""SubCategoryId"";
-            ");
-
-            migrationBuilder.Sql(@"
-                ALTER TABLE categories DROP COLUMN legacy_subcategory_id;
-            ");
-
-            // ---------------------------------------------------------------------------
-
-            migrationBuilder.DropTable(
-                name: "brands");
-
-            migrationBuilder.DropTable(
-                name: "item_types");
-
-            migrationBuilder.DropTable(
-                name: "product_config");
-
-            migrationBuilder.DropTable(
-                name: "subcategories");
-
-            migrationBuilder.DropIndex(
-                name: "IX_items_BrandId",
-                table: "items");
-
-            migrationBuilder.DropIndex(
-                name: "IX_items_SubCategoryId",
-                table: "items");
-
-            migrationBuilder.DropIndex(
-                name: "IX_categories_Name",
-                table: "categories");
-
-            migrationBuilder.DropIndex(
-                name: "IX_categories_Status",
-                table: "categories");
-
-            migrationBuilder.DropColumn(
-                name: "BrandId",
-                table: "items");
-
-            migrationBuilder.DropColumn(
-                name: "SubCategoryId",
-                table: "items");
-
-            migrationBuilder.DropColumn(
-                name: "CreatedAt",
-                table: "categories");
-
-            migrationBuilder.DropColumn(
-                name: "Status",
-                table: "categories");
-
-            migrationBuilder.DropColumn(
-                name: "UpdatedAt",
-                table: "categories");
-
-            migrationBuilder.DropColumn(
-                name: "xmin",
-                table: "categories");
-
-            migrationBuilder.RenameColumn(
-                name: "StockNature",
-                table: "items",
-                newName: "ItemType");
-
-            // ParentId itself was re-added at the top of this method, ahead of the reverse
-            // data migration that populates it.
-            migrationBuilder.CreateIndex(
-                name: "IX_categories_ParentId",
-                table: "categories",
-                column: "ParentId");
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_categories_categories_ParentId",
-                table: "categories",
-                column: "ParentId",
-                principalTable: "categories",
-                principalColumn: "CategoryId",
-                onDelete: ReferentialAction.Restrict);
-        }
-    }
-}
diff --git a/Backend/ERPCore/Infra/Persistence/Migrations/20260718081219_ini2.Designer.cs b/Backend/ERPCore/Infra/Persistence/Migrations/20260718081219_ini2.Designer.cs
deleted file mode 100644
index 184ab18..0000000
--- a/Backend/ERPCore/Infra/Persistence/Migrations/20260718081219_ini2.Designer.cs
+++ /dev/null
@@ -1,2454 +0,0 @@
-// <auto-generated />
-using System;
-using ERPCore.Infra.Persistence;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace ERPCore.Infra.Persistence.Migrations
-{
-    [DbContext(typeof(ErpDbContext))]
-    [Migration("20260718081219_ini2")]
-    partial class ini2
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.9")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.AuditLog", b =>
-                {
-                    b.Property<int>("AuditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("AuditId"));
-
-                    b.Property<string>("Action")
-                        .IsRequired()
-                        .HasMaxLength(10)
-                        .HasColumnType("character varying(10)");
-
-                    b.Property<string>("ChangeSet")
-                        .IsRequired()
-                        .HasColumnType("jsonb");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("EntityId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("EntityType")
-                        .IsRequired()
-                        .HasMaxLength(80)
-                        .HasColumnType("character varying(80)");
-
-                    b.Property<int>("UserId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("AuditId");
-
-                    b.HasIndex("CreatedAt");
-
-                    b.HasIndex("UserId");
-
-                    b.HasIndex("EntityType", "EntityId");
-
-                    b.ToTable("audit_logs", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Batch", b =>
-                {
-                    b.Property<int>("BatchId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("BatchId"));
-
-                    b.Property<string>("BatchNo")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<DateOnly?>("ExpiryDate")
-                        .HasColumnType("date");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("BatchId");
-
-                    b.HasIndex("ItemId", "BatchNo")
-                        .IsUnique();
-
-                    b.ToTable("batches", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Bin", b =>
-                {
-                    b.Property<int>("BinId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("BinId"));
-
-                    b.Property<string>("BinType")
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("BinId");
-
-                    b.HasIndex("WarehouseId", "Code")
-                        .IsUnique();
-
-                    b.ToTable("bins", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Brand", b =>
-                {
-                    b.Property<int>("BrandId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("BrandId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("BrandId");
-
-                    b.HasIndex("Name")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("brands", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Category", b =>
-                {
-                    b.Property<int>("CategoryId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CategoryId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("CategoryId");
-
-                    b.HasIndex("Name")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("categories", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Grn", b =>
-                {
-                    b.Property<int>("GrnId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GrnId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int?>("PoId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime?>("PostedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("VendorId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("GrnId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("PoId");
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("VendorId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("grns", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.GrnLine", b =>
-                {
-                    b.Property<int>("GrnLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GrnLineId"));
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("GrnId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("HoldStatus")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("PoLineId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("ReceivedValue")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("UnitCost")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.Property<int>("UomId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("GrnLineId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("BinId");
-
-                    b.HasIndex("GrnId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("PoLineId");
-
-                    b.HasIndex("UomId");
-
-                    b.ToTable("grn_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Item", b =>
-                {
-                    b.Property<int>("ItemId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ItemId"));
-
-                    b.Property<int>("BaseUomId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BrandId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("CategoryId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int?>("DefaultVendorId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Description")
-                        .HasMaxLength(1000)
-                        .HasColumnType("character varying(1000)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Sku")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<string>("StockNature")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int?>("SubCategoryId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("TaxClass")
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("TrackingMode")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("ItemId");
-
-                    b.HasIndex("BaseUomId");
-
-                    b.HasIndex("BrandId");
-
-                    b.HasIndex("CategoryId");
-
-                    b.HasIndex("DefaultVendorId");
-
-                    b.HasIndex("Sku")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("SubCategoryId");
-
-                    b.ToTable("items", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ItemReorder", b =>
-                {
-                    b.Property<int>("ReorderId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReorderId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("ReorderPoint")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("ReorderQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ReorderId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.HasIndex("ItemId", "WarehouseId")
-                        .IsUnique();
-
-                    b.ToTable("item_reorders", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ItemType", b =>
-                {
-                    b.Property<int>("ItemTypeId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ItemTypeId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("ItemTypeId");
-
-                    b.HasIndex("Name")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("item_types", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.JournalEntryStub", b =>
-                {
-                    b.Property<int>("JournalId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("JournalId"));
-
-                    b.Property<decimal>("Amount")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<string>("CreditAccount")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("DebitAccount")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("SourceDocId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("SourceDocType")
-                        .IsRequired()
-                        .HasMaxLength(10)
-                        .HasColumnType("character varying(10)");
-
-                    b.HasKey("JournalId");
-
-                    b.HasIndex("SourceDocType", "SourceDocId");
-
-                    b.ToTable("journal_entry_stubs", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.NumberSequence", b =>
-                {
-                    b.Property<int>("SequenceId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("SequenceId"));
-
-                    b.Property<string>("DocType")
-                        .IsRequired()
-                        .HasMaxLength(10)
-                        .HasColumnType("character varying(10)")
-                        .HasColumnName("doc_type");
-
-                    b.Property<int>("LastNumber")
-                        .HasColumnType("integer")
-                        .HasColumnName("last_number");
-
-                    b.Property<int>("Year")
-                        .HasColumnType("integer")
-                        .HasColumnName("year");
-
-                    b.HasKey("SequenceId");
-
-                    b.HasIndex("DocType", "Year")
-                        .IsUnique();
-
-                    b.ToTable("number_sequences", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PoLine", b =>
-                {
-                    b.Property<int>("PoLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("PoLineId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("PoId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("QtyReceived")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("Tax")
-                        .HasPrecision(9, 4)
-                        .HasColumnType("numeric(9,4)");
-
-                    b.Property<decimal>("UnitPrice")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("UomId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("PoLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("PoId");
-
-                    b.HasIndex("UomId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("po_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ProductConfig", b =>
-                {
-                    b.Property<int>("ConfigId")
-                        .HasColumnType("integer");
-
-                    b.Property<bool>("BrandsEnabled")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("boolean")
-                        .HasDefaultValue(true);
-
-                    b.Property<bool>("ItemTypesEnabled")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("boolean")
-                        .HasDefaultValue(true);
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<bool>("SubcategoriesEnabled")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("boolean")
-                        .HasDefaultValue(true);
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int?>("UpdatedBy")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ConfigId");
-
-                    b.HasIndex("UpdatedBy");
-
-                    b.ToTable("product_config", null, t =>
-                        {
-                            t.HasCheckConstraint("ck_product_config_singleton", "\"ConfigId\" = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseOrder", b =>
-                {
-                    b.Property<int>("PoId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("PoId"));
-
-                    b.Property<bool>("ApprovalRequired")
-                        .HasColumnType("boolean");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int?>("RequisitionId")
-                        .HasColumnType("integer");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("VendorId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("PoId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("RequisitionId");
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("VendorId");
-
-                    b.ToTable("purchase_orders", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturn", b =>
-                {
-                    b.Property<int>("ReturnId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReturnId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int>("ReasonCodeId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("VendorId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ReturnId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("ReasonCodeId");
-
-                    b.HasIndex("VendorId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("purchase_returns", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturnLine", b =>
-                {
-                    b.Property<int>("ReturnLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReturnLineId"));
-
-                    b.Property<int?>("GrnLineId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("ReturnId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ReturnLineId");
-
-                    b.HasIndex("GrnLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("ReturnId");
-
-                    b.ToTable("purchase_return_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ReasonCode", b =>
-                {
-                    b.Property<int>("ReasonCodeId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReasonCodeId"));
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("Context")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.HasKey("ReasonCodeId");
-
-                    b.HasIndex("Context", "Code")
-                        .IsUnique();
-
-                    b.ToTable("reason_codes", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Requisition", b =>
-                {
-                    b.Property<int>("RequisitionId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RequisitionId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int>("RequestedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("RequisitionId");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("RequestedBy");
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("requisitions", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RequisitionLine", b =>
-                {
-                    b.Property<int>("ReqLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReqLineId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<DateOnly?>("RequiredBy")
-                        .HasColumnType("date");
-
-                    b.Property<int>("RequisitionId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ReqLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("RequisitionId");
-
-                    b.ToTable("requisition_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Rfq", b =>
-                {
-                    b.Property<int>("RfqId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RfqId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int>("RequisitionId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("RfqId");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("RequisitionId");
-
-                    b.ToTable("rfqs", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RfqLine", b =>
-                {
-                    b.Property<int>("RfqLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RfqLineId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("RfqId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("RfqLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("RfqId");
-
-                    b.ToTable("rfq_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Serial", b =>
-                {
-                    b.Property<int>("SerialId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("SerialId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("SerialNo")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("character varying(100)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("SerialId");
-
-                    b.HasIndex("ItemId", "SerialNo")
-                        .IsUnique();
-
-                    b.ToTable("serials", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustment", b =>
-                {
-                    b.Property<int>("AdjustmentId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("AdjustmentId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int>("ReasonCodeId")
-                        .HasColumnType("integer");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("AdjustmentId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("ReasonCodeId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("stock_adjustments", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustmentLine", b =>
-                {
-                    b.Property<int>("AdjLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("AdjLineId"));
-
-                    b.Property<int>("AdjustmentId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("QtyDelta")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int?>("SerialId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("AdjLineId");
-
-                    b.HasIndex("AdjustmentId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("BinId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("SerialId");
-
-                    b.ToTable("stock_adjustment_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCount", b =>
-                {
-                    b.Property<int>("CountId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CountId"));
-
-                    b.Property<string>("CountType")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("CountId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("stock_counts", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCountLine", b =>
-                {
-                    b.Property<int>("CountLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CountLineId"));
-
-                    b.Property<int?>("BinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("CountId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal?>("CountedQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("SystemQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal?>("Variance")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.HasKey("CountLineId");
-
-                    b.HasIndex("BinId");
-
-                    b.HasIndex("CountId");
-
-                    b.HasIndex("ItemId");
-
-                    b.ToTable("stock_count_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockLayer", b =>
-                {
-                    b.Property<int>("LayerId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("LayerId"));
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("GrnLineId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("QtyReceived")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("QtyRemaining")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<DateTime>("ReceiptDate")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int?>("SerialId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("UnitCost")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("LayerId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("GrnLineId");
-
-                    b.HasIndex("SerialId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.HasIndex("ItemId", "WarehouseId", "ReceiptDate", "LayerId");
-
-                    b.ToTable("stock_layers", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockLedger", b =>
-                {
-                    b.Property<int>("LedgerId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("LedgerId"));
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BinId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Direction")
-                        .IsRequired()
-                        .HasMaxLength(5)
-                        .HasColumnType("character varying(5)");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("QtyBase")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("RunningBalance")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int?>("SerialId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("SourceDocId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("SourceDocType")
-                        .IsRequired()
-                        .HasMaxLength(10)
-                        .HasColumnType("character varying(10)");
-
-                    b.Property<decimal>("UnitCost")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.Property<int>("UserId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Value")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("LedgerId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("BinId");
-
-                    b.HasIndex("SerialId");
-
-                    b.HasIndex("UserId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.HasIndex("SourceDocType", "SourceDocId");
-
-                    b.HasIndex("ItemId", "WarehouseId", "CreatedAt");
-
-                    b.HasIndex("ItemId", "WarehouseId", "LedgerId");
-
-                    b.ToTable("stock_ledger", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransfer", b =>
-                {
-                    b.Property<int>("TransferId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TransferId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("DestWarehouseId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<int>("SrcWarehouseId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("TransferId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DestWarehouseId");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("SrcWarehouseId");
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("stock_transfers", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransferLine", b =>
-                {
-                    b.Property<int>("TransferLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TransferLineId"));
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("DestBinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("QtyReceived")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int?>("SerialId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("SrcBinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("TransferId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal?>("UnitCost")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.HasKey("TransferLineId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("DestBinId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("SerialId");
-
-                    b.HasIndex("SrcBinId");
-
-                    b.HasIndex("TransferId");
-
-                    b.ToTable("stock_transfer_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.SubCategory", b =>
-                {
-                    b.Property<int>("SubCategoryId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("SubCategoryId"));
-
-                    b.Property<int>("CategoryId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("SubCategoryId");
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("CategoryId", "Name")
-                        .IsUnique();
-
-                    b.ToTable("subcategories", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Uom", b =>
-                {
-                    b.Property<int>("UomId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("UomId"));
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.HasKey("UomId");
-
-                    b.HasIndex("Name")
-                        .IsUnique();
-
-                    b.ToTable("uoms", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.UomConversion", b =>
-                {
-                    b.Property<int>("ConversionId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ConversionId"));
-
-                    b.Property<decimal>("Factor")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.Property<int>("FromUomId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ToUomId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ConversionId");
-
-                    b.HasIndex("FromUomId");
-
-                    b.HasIndex("ToUomId");
-
-                    b.HasIndex("ItemId", "FromUomId", "ToUomId")
-                        .IsUnique();
-
-                    b.ToTable("uom_conversions", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.User", b =>
-                {
-                    b.Property<int>("UserId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("UserId"));
-
-                    b.Property<Guid?>("AuthUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("auth_user_id");
-
-                    b.Property<string>("DisplayName")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("Username")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("character varying(100)");
-
-                    b.HasKey("UserId");
-
-                    b.HasIndex("AuthUserId")
-                        .IsUnique();
-
-                    b.HasIndex("Username")
-                        .IsUnique();
-
-                    b.ToTable("users", (string)null);
-
-                    b.HasData(
-                        new
-                        {
-                            UserId = 1,
-                            DisplayName = "System",
-                            Status = "Active",
-                            Username = "system"
-                        });
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Vendor", b =>
-                {
-                    b.Property<int>("VendorId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("VendorId"));
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Currency")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(3)
-                        .HasColumnType("character varying(3)")
-                        .HasDefaultValue("LKR");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<string>("TaxReg")
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Terms")
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("VendorId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("vendors", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotation", b =>
-                {
-                    b.Property<int>("QuotationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("QuotationId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("RfqId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("VendorId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("QuotationId");
-
-                    b.HasIndex("VendorId");
-
-                    b.HasIndex("RfqId", "VendorId")
-                        .IsUnique();
-
-                    b.ToTable("vendor_quotations", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotationLine", b =>
-                {
-                    b.Property<int>("QuotationLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("QuotationLineId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("LeadDays")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("QuotationId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("UnitPrice")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.HasKey("QuotationLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("QuotationId");
-
-                    b.ToTable("vendor_quotation_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Warehouse", b =>
-                {
-                    b.Property<int>("WarehouseId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("WarehouseId"));
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.HasKey("WarehouseId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.ToTable("warehouses", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.AuditLog", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Batch", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Bin", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany("Bins")
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Grn", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.PurchaseOrder", "PurchaseOrder")
-                        .WithMany()
-                        .HasForeignKey("PoId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "Vendor")
-                        .WithMany()
-                        .HasForeignKey("VendorId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("PurchaseOrder");
-
-                    b.Navigation("Vendor");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.GrnLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Batch", "Batch")
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", "Bin")
-                        .WithMany()
-                        .HasForeignKey("BinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Grn", "Grn")
-                        .WithMany("Lines")
-                        .HasForeignKey("GrnId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.PoLine", "PoLine")
-                        .WithMany()
-                        .HasForeignKey("PoLineId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
-                        .WithMany()
-                        .HasForeignKey("UomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Batch");
-
-                    b.Navigation("Bin");
-
-                    b.Navigation("Grn");
-
-                    b.Navigation("Item");
-
-                    b.Navigation("PoLine");
-
-                    b.Navigation("Uom");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Item", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "BaseUom")
-                        .WithMany()
-                        .HasForeignKey("BaseUomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Brand", "Brand")
-                        .WithMany()
-                        .HasForeignKey("BrandId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Category", "Category")
-                        .WithMany()
-                        .HasForeignKey("CategoryId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "DefaultVendor")
-                        .WithMany()
-                        .HasForeignKey("DefaultVendorId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.SubCategory", "SubCategory")
-                        .WithMany()
-                        .HasForeignKey("SubCategoryId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("BaseUom");
-
-                    b.Navigation("Brand");
-
-                    b.Navigation("Category");
-
-                    b.Navigation("DefaultVendor");
-
-                    b.Navigation("SubCategory");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ItemReorder", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany("ReorderSettings")
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PoLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.PurchaseOrder", "PurchaseOrder")
-                        .WithMany("Lines")
-                        .HasForeignKey("PoId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
-                        .WithMany()
-                        .HasForeignKey("UomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("PurchaseOrder");
-
-                    b.Navigation("Uom");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ProductConfig", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "UpdatedByUser")
-                        .WithMany()
-                        .HasForeignKey("UpdatedBy")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("UpdatedByUser");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseOrder", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Requisition", "Requisition")
-                        .WithMany()
-                        .HasForeignKey("RequisitionId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "Vendor")
-                        .WithMany()
-                        .HasForeignKey("VendorId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("Requisition");
-
-                    b.Navigation("Vendor");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturn", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.ReasonCode", "ReasonCode")
-                        .WithMany()
-                        .HasForeignKey("ReasonCodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "Vendor")
-                        .WithMany()
-                        .HasForeignKey("VendorId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("ReasonCode");
-
-                    b.Navigation("Vendor");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturnLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.GrnLine", "GrnLine")
-                        .WithMany()
-                        .HasForeignKey("GrnLineId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.PurchaseReturn", "Return")
-                        .WithMany("Lines")
-                        .HasForeignKey("ReturnId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("GrnLine");
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Return");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Requisition", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Requester")
-                        .WithMany()
-                        .HasForeignKey("RequestedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Requester");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RequisitionLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Requisition", "Requisition")
-                        .WithMany("Lines")
-                        .HasForeignKey("RequisitionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Requisition");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Rfq", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Requisition", "Requisition")
-                        .WithMany()
-                        .HasForeignKey("RequisitionId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Requisition");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RfqLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Rfq", "Rfq")
-                        .WithMany("Lines")
-                        .HasForeignKey("RfqId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Rfq");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Serial", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustment", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.ReasonCode", "ReasonCode")
-                        .WithMany()
-                        .HasForeignKey("ReasonCodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("ReasonCode");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustmentLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.StockAdjustment", "Adjustment")
-                        .WithMany("Lines")
-                        .HasForeignKey("AdjustmentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Batch", null)
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("BinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Serial", null)
-                        .WithMany()
-                        .HasForeignKey("SerialId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("Adjustment");
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCount", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCountLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("BinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.StockCount", "Count")
-                        .WithMany("Lines")
-                        .HasForeignKey("CountId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Count");
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockLayer", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Batch", "Batch")
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.GrnLine", "GrnLine")
-                        .WithMany()
-                        .HasForeignKey("GrnLineId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Serial", "Serial")
-                        .WithMany()
-                        .HasForeignKey("SerialId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Batch");
-
-                    b.Navigation("GrnLine");
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Serial");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockLedger", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Batch", null)
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("BinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", null)
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Serial", null)
-                        .WithMany()
-                        .HasForeignKey("SerialId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.User", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", null)
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransfer", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "DestWarehouse")
-                        .WithMany()
-                        .HasForeignKey("DestWarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "SrcWarehouse")
-                        .WithMany()
-                        .HasForeignKey("SrcWarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("DestWarehouse");
-
-                    b.Navigation("SrcWarehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransferLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Batch", null)
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("DestBinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Serial", null)
-                        .WithMany()
-                        .HasForeignKey("SerialId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("SrcBinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.StockTransfer", "Transfer")
-                        .WithMany("Lines")
-                        .HasForeignKey("TransferId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Transfer");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.SubCategory", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Category", "Category")
-                        .WithMany("SubCategories")
-                        .HasForeignKey("CategoryId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Category");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.UomConversion", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "FromUom")
-                        .WithMany()
-                        .HasForeignKey("FromUomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany("UomConversions")
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "ToUom")
-                        .WithMany()
-                        .HasForeignKey("ToUomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("FromUom");
-
-                    b.Navigation("Item");
-
-                    b.Navigation("ToUom");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotation", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Rfq", "Rfq")
-                        .WithMany("Quotations")
-                        .HasForeignKey("RfqId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "Vendor")
-                        .WithMany()
-                        .HasForeignKey("VendorId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Rfq");
-
-                    b.Navigation("Vendor");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotationLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.VendorQuotation", "Quotation")
-                        .WithMany("Lines")
-                        .HasForeignKey("QuotationId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Quotation");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Category", b =>
-                {
-                    b.Navigation("SubCategories");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Grn", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Item", b =>
-                {
-                    b.Navigation("ReorderSettings");
-
-                    b.Navigation("UomConversions");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseOrder", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturn", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Requisition", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Rfq", b =>
-                {
-                    b.Navigation("Lines");
-
-                    b.Navigation("Quotations");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustment", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCount", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransfer", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotation", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Warehouse", b =>
-                {
-                    b.Navigation("Bins");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/Backend/ERPCore/Infra/Persistence/Migrations/20260718081219_ini2.cs b/Backend/ERPCore/Infra/Persistence/Migrations/20260718081219_ini2.cs
deleted file mode 100644
index 4c89398..0000000
--- a/Backend/ERPCore/Infra/Persistence/Migrations/20260718081219_ini2.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace ERPCore.Infra.Persistence.Migrations
-{
-    /// <inheritdoc />
-    public partial class ini2 : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-
-        }
-    }
-}
diff --git a/Backend/ERPCore/Infra/Persistence/Migrations/20260718092655_AddRolesNavPermissions.Designer.cs b/Backend/ERPCore/Infra/Persistence/Migrations/20260718092655_AddRolesNavPermissions.Designer.cs
deleted file mode 100644
index ca80bfc..0000000
--- a/Backend/ERPCore/Infra/Persistence/Migrations/20260718092655_AddRolesNavPermissions.Designer.cs
+++ /dev/null
@@ -1,3001 +0,0 @@
-// <auto-generated />
-using System;
-using ERPCore.Infra.Persistence;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace ERPCore.Infra.Persistence.Migrations
-{
-    [DbContext(typeof(ErpDbContext))]
-    [Migration("20260718092655_AddRolesNavPermissions")]
-    partial class AddRolesNavPermissions
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.9")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.AuditLog", b =>
-                {
-                    b.Property<int>("AuditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("AuditId"));
-
-                    b.Property<string>("Action")
-                        .IsRequired()
-                        .HasMaxLength(10)
-                        .HasColumnType("character varying(10)");
-
-                    b.Property<string>("ChangeSet")
-                        .IsRequired()
-                        .HasColumnType("jsonb");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("EntityId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("EntityType")
-                        .IsRequired()
-                        .HasMaxLength(80)
-                        .HasColumnType("character varying(80)");
-
-                    b.Property<int>("UserId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("AuditId");
-
-                    b.HasIndex("CreatedAt");
-
-                    b.HasIndex("UserId");
-
-                    b.HasIndex("EntityType", "EntityId");
-
-                    b.ToTable("audit_logs", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Batch", b =>
-                {
-                    b.Property<int>("BatchId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("BatchId"));
-
-                    b.Property<string>("BatchNo")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<DateOnly?>("ExpiryDate")
-                        .HasColumnType("date");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("BatchId");
-
-                    b.HasIndex("ItemId", "BatchNo")
-                        .IsUnique();
-
-                    b.ToTable("batches", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Bin", b =>
-                {
-                    b.Property<int>("BinId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("BinId"));
-
-                    b.Property<string>("BinType")
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("BinId");
-
-                    b.HasIndex("WarehouseId", "Code")
-                        .IsUnique();
-
-                    b.ToTable("bins", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Brand", b =>
-                {
-                    b.Property<int>("BrandId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("BrandId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("BrandId");
-
-                    b.HasIndex("Name")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("brands", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Category", b =>
-                {
-                    b.Property<int>("CategoryId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CategoryId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("CategoryId");
-
-                    b.HasIndex("Name")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("categories", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Grn", b =>
-                {
-                    b.Property<int>("GrnId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GrnId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int?>("PoId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime?>("PostedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("VendorId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("GrnId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("PoId");
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("VendorId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("grns", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.GrnLine", b =>
-                {
-                    b.Property<int>("GrnLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GrnLineId"));
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("GrnId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("HoldStatus")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("PoLineId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("ReceivedValue")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("UnitCost")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.Property<int>("UomId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("GrnLineId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("BinId");
-
-                    b.HasIndex("GrnId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("PoLineId");
-
-                    b.HasIndex("UomId");
-
-                    b.ToTable("grn_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Item", b =>
-                {
-                    b.Property<int>("ItemId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ItemId"));
-
-                    b.Property<int>("BaseUomId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BrandId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("CategoryId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int?>("DefaultVendorId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Description")
-                        .HasMaxLength(1000)
-                        .HasColumnType("character varying(1000)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Sku")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<string>("StockNature")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int?>("SubCategoryId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("TaxClass")
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("TrackingMode")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("ItemId");
-
-                    b.HasIndex("BaseUomId");
-
-                    b.HasIndex("BrandId");
-
-                    b.HasIndex("CategoryId");
-
-                    b.HasIndex("DefaultVendorId");
-
-                    b.HasIndex("Sku")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("SubCategoryId");
-
-                    b.ToTable("items", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ItemReorder", b =>
-                {
-                    b.Property<int>("ReorderId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReorderId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("ReorderPoint")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("ReorderQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ReorderId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.HasIndex("ItemId", "WarehouseId")
-                        .IsUnique();
-
-                    b.ToTable("item_reorders", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ItemType", b =>
-                {
-                    b.Property<int>("ItemTypeId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ItemTypeId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("ItemTypeId");
-
-                    b.HasIndex("Name")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("item_types", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.JournalEntryStub", b =>
-                {
-                    b.Property<int>("JournalId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("JournalId"));
-
-                    b.Property<decimal>("Amount")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<string>("CreditAccount")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("DebitAccount")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("SourceDocId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("SourceDocType")
-                        .IsRequired()
-                        .HasMaxLength(10)
-                        .HasColumnType("character varying(10)");
-
-                    b.HasKey("JournalId");
-
-                    b.HasIndex("SourceDocType", "SourceDocId");
-
-                    b.ToTable("journal_entry_stubs", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.NavItem", b =>
-                {
-                    b.Property<int>("NavItemId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NavItemId"));
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Href")
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<string>("Icon")
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("character varying(100)");
-
-                    b.Property<int>("SortOrder")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.HasKey("NavItemId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.ToTable("nav_items", (string)null);
-
-                    b.HasData(
-                        new
-                        {
-                            NavItemId = 1,
-                            Code = "dashboard",
-                            Href = "/dashboard",
-                            Label = "Dashboard",
-                            SortOrder = 1,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            NavItemId = 2,
-                            Code = "products",
-                            Href = "/dashboard/products",
-                            Label = "Products",
-                            SortOrder = 2,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            NavItemId = 3,
-                            Code = "vendors",
-                            Href = "/dashboard/vendors",
-                            Label = "Vendors",
-                            SortOrder = 3,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            NavItemId = 4,
-                            Code = "procurement",
-                            Href = "/dashboard/procurement",
-                            Label = "Procurement",
-                            SortOrder = 4,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            NavItemId = 5,
-                            Code = "receiving",
-                            Href = "/dashboard/receiving/grn",
-                            Label = "Receiving",
-                            SortOrder = 5,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            NavItemId = 6,
-                            Code = "stock",
-                            Href = "/dashboard/stock",
-                            Label = "Stock",
-                            SortOrder = 6,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            NavItemId = 7,
-                            Code = "warehouses",
-                            Href = "/dashboard/warehouse",
-                            Label = "Warehouses",
-                            SortOrder = 7,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            NavItemId = 8,
-                            Code = "orders",
-                            Href = "/dashboard/orders",
-                            Label = "Orders",
-                            SortOrder = 8,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            NavItemId = 9,
-                            Code = "settings",
-                            Href = "/dashboard/settings",
-                            Label = "Settings",
-                            SortOrder = 9,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            NavItemId = 10,
-                            Code = "help",
-                            Href = "/dashboard/help",
-                            Label = "Help",
-                            SortOrder = 10,
-                            Status = "Active"
-                        });
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.NumberSequence", b =>
-                {
-                    b.Property<int>("SequenceId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("SequenceId"));
-
-                    b.Property<string>("DocType")
-                        .IsRequired()
-                        .HasMaxLength(10)
-                        .HasColumnType("character varying(10)")
-                        .HasColumnName("doc_type");
-
-                    b.Property<int>("LastNumber")
-                        .HasColumnType("integer")
-                        .HasColumnName("last_number");
-
-                    b.Property<int>("Year")
-                        .HasColumnType("integer")
-                        .HasColumnName("year");
-
-                    b.HasKey("SequenceId");
-
-                    b.HasIndex("DocType", "Year")
-                        .IsUnique();
-
-                    b.ToTable("number_sequences", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Permission", b =>
-                {
-                    b.Property<int>("PermissionId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("PermissionId"));
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(80)
-                        .HasColumnType("character varying(80)");
-
-                    b.Property<int?>("NavItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("SubNavItemId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("PermissionId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.HasIndex("NavItemId");
-
-                    b.HasIndex("SubNavItemId");
-
-                    b.ToTable("permissions", (string)null);
-
-                    b.HasData(
-                        new
-                        {
-                            PermissionId = 1,
-                            Code = "NAV:dashboard",
-                            NavItemId = 1
-                        },
-                        new
-                        {
-                            PermissionId = 2,
-                            Code = "NAV:products",
-                            NavItemId = 2
-                        },
-                        new
-                        {
-                            PermissionId = 3,
-                            Code = "NAV:vendors",
-                            NavItemId = 3
-                        },
-                        new
-                        {
-                            PermissionId = 4,
-                            Code = "NAV:procurement",
-                            NavItemId = 4
-                        },
-                        new
-                        {
-                            PermissionId = 5,
-                            Code = "NAV:receiving",
-                            NavItemId = 5
-                        },
-                        new
-                        {
-                            PermissionId = 6,
-                            Code = "NAV:stock",
-                            NavItemId = 6
-                        },
-                        new
-                        {
-                            PermissionId = 7,
-                            Code = "NAV:warehouses",
-                            NavItemId = 7
-                        },
-                        new
-                        {
-                            PermissionId = 8,
-                            Code = "NAV:orders",
-                            NavItemId = 8
-                        },
-                        new
-                        {
-                            PermissionId = 9,
-                            Code = "NAV:settings",
-                            NavItemId = 9
-                        },
-                        new
-                        {
-                            PermissionId = 10,
-                            Code = "NAV:help",
-                            NavItemId = 10
-                        },
-                        new
-                        {
-                            PermissionId = 11,
-                            Code = "NAV:products.item",
-                            SubNavItemId = 1
-                        },
-                        new
-                        {
-                            PermissionId = 12,
-                            Code = "NAV:products.category",
-                            SubNavItemId = 2
-                        },
-                        new
-                        {
-                            PermissionId = 13,
-                            Code = "NAV:products.brand",
-                            SubNavItemId = 3
-                        },
-                        new
-                        {
-                            PermissionId = 14,
-                            Code = "NAV:products.item-type",
-                            SubNavItemId = 4
-                        },
-                        new
-                        {
-                            PermissionId = 15,
-                            Code = "NAV:products.uom",
-                            SubNavItemId = 5
-                        },
-                        new
-                        {
-                            PermissionId = 16,
-                            Code = "NAV:products.configuration",
-                            SubNavItemId = 6
-                        },
-                        new
-                        {
-                            PermissionId = 17,
-                            Code = "NAV:settings.roles",
-                            SubNavItemId = 7
-                        },
-                        new
-                        {
-                            PermissionId = 18,
-                            Code = "NAV:settings.users",
-                            SubNavItemId = 8
-                        });
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PoLine", b =>
-                {
-                    b.Property<int>("PoLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("PoLineId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("PoId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("QtyReceived")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("Tax")
-                        .HasPrecision(9, 4)
-                        .HasColumnType("numeric(9,4)");
-
-                    b.Property<decimal>("UnitPrice")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("UomId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("PoLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("PoId");
-
-                    b.HasIndex("UomId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("po_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ProductConfig", b =>
-                {
-                    b.Property<int>("ConfigId")
-                        .HasColumnType("integer");
-
-                    b.Property<bool>("BrandsEnabled")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("boolean")
-                        .HasDefaultValue(true);
-
-                    b.Property<bool>("ItemTypesEnabled")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("boolean")
-                        .HasDefaultValue(true);
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<bool>("SubcategoriesEnabled")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("boolean")
-                        .HasDefaultValue(true);
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int?>("UpdatedBy")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ConfigId");
-
-                    b.HasIndex("UpdatedBy");
-
-                    b.ToTable("product_config", null, t =>
-                        {
-                            t.HasCheckConstraint("ck_product_config_singleton", "\"ConfigId\" = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseOrder", b =>
-                {
-                    b.Property<int>("PoId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("PoId"));
-
-                    b.Property<bool>("ApprovalRequired")
-                        .HasColumnType("boolean");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int?>("RequisitionId")
-                        .HasColumnType("integer");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("VendorId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("PoId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("RequisitionId");
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("VendorId");
-
-                    b.ToTable("purchase_orders", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturn", b =>
-                {
-                    b.Property<int>("ReturnId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReturnId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int>("ReasonCodeId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("VendorId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ReturnId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("ReasonCodeId");
-
-                    b.HasIndex("VendorId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("purchase_returns", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturnLine", b =>
-                {
-                    b.Property<int>("ReturnLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReturnLineId"));
-
-                    b.Property<int?>("GrnLineId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("ReturnId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ReturnLineId");
-
-                    b.HasIndex("GrnLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("ReturnId");
-
-                    b.ToTable("purchase_return_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ReasonCode", b =>
-                {
-                    b.Property<int>("ReasonCodeId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReasonCodeId"));
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("Context")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.HasKey("ReasonCodeId");
-
-                    b.HasIndex("Context", "Code")
-                        .IsUnique();
-
-                    b.ToTable("reason_codes", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Requisition", b =>
-                {
-                    b.Property<int>("RequisitionId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RequisitionId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int>("RequestedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("RequisitionId");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("RequestedBy");
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("requisitions", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RequisitionLine", b =>
-                {
-                    b.Property<int>("ReqLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReqLineId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<DateOnly?>("RequiredBy")
-                        .HasColumnType("date");
-
-                    b.Property<int>("RequisitionId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ReqLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("RequisitionId");
-
-                    b.ToTable("requisition_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Rfq", b =>
-                {
-                    b.Property<int>("RfqId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RfqId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int>("RequisitionId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("RfqId");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("RequisitionId");
-
-                    b.ToTable("rfqs", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RfqLine", b =>
-                {
-                    b.Property<int>("RfqLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RfqLineId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("RfqId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("RfqLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("RfqId");
-
-                    b.ToTable("rfq_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Role", b =>
-                {
-                    b.Property<int>("RoleId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RoleId"));
-
-                    b.Property<Guid>("AuthRoleId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("auth_role_id");
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<bool>("IsSystemRole")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("boolean")
-                        .HasDefaultValue(false);
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("RoleId");
-
-                    b.HasIndex("AuthRoleId")
-                        .IsUnique();
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.ToTable("roles", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RolePermission", b =>
-                {
-                    b.Property<int>("RoleId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("PermissionId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("RoleId", "PermissionId");
-
-                    b.HasIndex("PermissionId");
-
-                    b.ToTable("role_permissions", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Serial", b =>
-                {
-                    b.Property<int>("SerialId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("SerialId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("SerialNo")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("character varying(100)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("SerialId");
-
-                    b.HasIndex("ItemId", "SerialNo")
-                        .IsUnique();
-
-                    b.ToTable("serials", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustment", b =>
-                {
-                    b.Property<int>("AdjustmentId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("AdjustmentId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int>("ReasonCodeId")
-                        .HasColumnType("integer");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("AdjustmentId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("ReasonCodeId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("stock_adjustments", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustmentLine", b =>
-                {
-                    b.Property<int>("AdjLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("AdjLineId"));
-
-                    b.Property<int>("AdjustmentId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("QtyDelta")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int?>("SerialId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("AdjLineId");
-
-                    b.HasIndex("AdjustmentId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("BinId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("SerialId");
-
-                    b.ToTable("stock_adjustment_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCount", b =>
-                {
-                    b.Property<int>("CountId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CountId"));
-
-                    b.Property<string>("CountType")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("CountId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("stock_counts", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCountLine", b =>
-                {
-                    b.Property<int>("CountLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CountLineId"));
-
-                    b.Property<int?>("BinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("CountId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal?>("CountedQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("SystemQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal?>("Variance")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.HasKey("CountLineId");
-
-                    b.HasIndex("BinId");
-
-                    b.HasIndex("CountId");
-
-                    b.HasIndex("ItemId");
-
-                    b.ToTable("stock_count_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockLayer", b =>
-                {
-                    b.Property<int>("LayerId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("LayerId"));
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("GrnLineId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("QtyReceived")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("QtyRemaining")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<DateTime>("ReceiptDate")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int?>("SerialId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("UnitCost")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("LayerId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("GrnLineId");
-
-                    b.HasIndex("SerialId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.HasIndex("ItemId", "WarehouseId", "ReceiptDate", "LayerId");
-
-                    b.ToTable("stock_layers", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockLedger", b =>
-                {
-                    b.Property<int>("LedgerId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("LedgerId"));
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BinId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Direction")
-                        .IsRequired()
-                        .HasMaxLength(5)
-                        .HasColumnType("character varying(5)");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("QtyBase")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("RunningBalance")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int?>("SerialId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("SourceDocId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("SourceDocType")
-                        .IsRequired()
-                        .HasMaxLength(10)
-                        .HasColumnType("character varying(10)");
-
-                    b.Property<decimal>("UnitCost")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.Property<int>("UserId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Value")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("LedgerId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("BinId");
-
-                    b.HasIndex("SerialId");
-
-                    b.HasIndex("UserId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.HasIndex("SourceDocType", "SourceDocId");
-
-                    b.HasIndex("ItemId", "WarehouseId", "CreatedAt");
-
-                    b.HasIndex("ItemId", "WarehouseId", "LedgerId");
-
-                    b.ToTable("stock_ledger", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransfer", b =>
-                {
-                    b.Property<int>("TransferId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TransferId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("DestWarehouseId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<int>("SrcWarehouseId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("TransferId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DestWarehouseId");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("SrcWarehouseId");
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("stock_transfers", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransferLine", b =>
-                {
-                    b.Property<int>("TransferLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TransferLineId"));
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("DestBinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("QtyReceived")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int?>("SerialId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("SrcBinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("TransferId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal?>("UnitCost")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.HasKey("TransferLineId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("DestBinId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("SerialId");
-
-                    b.HasIndex("SrcBinId");
-
-                    b.HasIndex("TransferId");
-
-                    b.ToTable("stock_transfer_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.SubCategory", b =>
-                {
-                    b.Property<int>("SubCategoryId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("SubCategoryId"));
-
-                    b.Property<int>("CategoryId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("SubCategoryId");
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("CategoryId", "Name")
-                        .IsUnique();
-
-                    b.ToTable("subcategories", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.SubNavItem", b =>
-                {
-                    b.Property<int>("SubNavItemId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("SubNavItemId"));
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Href")
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<string>("Icon")
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("character varying(100)");
-
-                    b.Property<int>("NavItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("SortOrder")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.HasKey("SubNavItemId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.HasIndex("NavItemId");
-
-                    b.ToTable("sub_nav_items", (string)null);
-
-                    b.HasData(
-                        new
-                        {
-                            SubNavItemId = 1,
-                            Code = "products.item",
-                            Href = "/dashboard/products",
-                            Label = "Item",
-                            NavItemId = 2,
-                            SortOrder = 1,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            SubNavItemId = 2,
-                            Code = "products.category",
-                            Href = "/dashboard/products/categories",
-                            Label = "Category",
-                            NavItemId = 2,
-                            SortOrder = 2,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            SubNavItemId = 3,
-                            Code = "products.brand",
-                            Href = "/dashboard/products/brands",
-                            Label = "Brand",
-                            NavItemId = 2,
-                            SortOrder = 3,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            SubNavItemId = 4,
-                            Code = "products.item-type",
-                            Href = "/dashboard/products/item-types",
-                            Label = "Item Type",
-                            NavItemId = 2,
-                            SortOrder = 4,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            SubNavItemId = 5,
-                            Code = "products.uom",
-                            Href = "/dashboard/products/uoms",
-                            Label = "UOM",
-                            NavItemId = 2,
-                            SortOrder = 5,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            SubNavItemId = 6,
-                            Code = "products.configuration",
-                            Href = "/dashboard/products/settings",
-                            Label = "Configuration",
-                            NavItemId = 2,
-                            SortOrder = 6,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            SubNavItemId = 7,
-                            Code = "settings.roles",
-                            Href = "/dashboard/settings/roles",
-                            Label = "Roles",
-                            NavItemId = 9,
-                            SortOrder = 1,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            SubNavItemId = 8,
-                            Code = "settings.users",
-                            Href = "/dashboard/settings/users",
-                            Label = "Users",
-                            NavItemId = 9,
-                            SortOrder = 2,
-                            Status = "Active"
-                        });
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Uom", b =>
-                {
-                    b.Property<int>("UomId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("UomId"));
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.HasKey("UomId");
-
-                    b.HasIndex("Name")
-                        .IsUnique();
-
-                    b.ToTable("uoms", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.UomConversion", b =>
-                {
-                    b.Property<int>("ConversionId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ConversionId"));
-
-                    b.Property<decimal>("Factor")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.Property<int>("FromUomId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ToUomId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ConversionId");
-
-                    b.HasIndex("FromUomId");
-
-                    b.HasIndex("ToUomId");
-
-                    b.HasIndex("ItemId", "FromUomId", "ToUomId")
-                        .IsUnique();
-
-                    b.ToTable("uom_conversions", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.User", b =>
-                {
-                    b.Property<int>("UserId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("UserId"));
-
-                    b.Property<Guid?>("AuthUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("auth_user_id");
-
-                    b.Property<string>("DisplayName")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<int?>("RoleId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("Username")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("character varying(100)");
-
-                    b.HasKey("UserId");
-
-                    b.HasIndex("AuthUserId")
-                        .IsUnique();
-
-                    b.HasIndex("RoleId");
-
-                    b.HasIndex("Username")
-                        .IsUnique();
-
-                    b.ToTable("users", (string)null);
-
-                    b.HasData(
-                        new
-                        {
-                            UserId = 1,
-                            DisplayName = "System",
-                            Status = "Active",
-                            Username = "system"
-                        });
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Vendor", b =>
-                {
-                    b.Property<int>("VendorId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("VendorId"));
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Currency")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(3)
-                        .HasColumnType("character varying(3)")
-                        .HasDefaultValue("LKR");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<string>("TaxReg")
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Terms")
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("VendorId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("vendors", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotation", b =>
-                {
-                    b.Property<int>("QuotationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("QuotationId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("RfqId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("VendorId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("QuotationId");
-
-                    b.HasIndex("VendorId");
-
-                    b.HasIndex("RfqId", "VendorId")
-                        .IsUnique();
-
-                    b.ToTable("vendor_quotations", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotationLine", b =>
-                {
-                    b.Property<int>("QuotationLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("QuotationLineId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("LeadDays")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("QuotationId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("UnitPrice")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.HasKey("QuotationLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("QuotationId");
-
-                    b.ToTable("vendor_quotation_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Warehouse", b =>
-                {
-                    b.Property<int>("WarehouseId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("WarehouseId"));
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.HasKey("WarehouseId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.ToTable("warehouses", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.AuditLog", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Batch", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Bin", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany("Bins")
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Grn", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.PurchaseOrder", "PurchaseOrder")
-                        .WithMany()
-                        .HasForeignKey("PoId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "Vendor")
-                        .WithMany()
-                        .HasForeignKey("VendorId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("PurchaseOrder");
-
-                    b.Navigation("Vendor");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.GrnLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Batch", "Batch")
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", "Bin")
-                        .WithMany()
-                        .HasForeignKey("BinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Grn", "Grn")
-                        .WithMany("Lines")
-                        .HasForeignKey("GrnId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.PoLine", "PoLine")
-                        .WithMany()
-                        .HasForeignKey("PoLineId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
-                        .WithMany()
-                        .HasForeignKey("UomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Batch");
-
-                    b.Navigation("Bin");
-
-                    b.Navigation("Grn");
-
-                    b.Navigation("Item");
-
-                    b.Navigation("PoLine");
-
-                    b.Navigation("Uom");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Item", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "BaseUom")
-                        .WithMany()
-                        .HasForeignKey("BaseUomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Brand", "Brand")
-                        .WithMany()
-                        .HasForeignKey("BrandId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Category", "Category")
-                        .WithMany()
-                        .HasForeignKey("CategoryId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "DefaultVendor")
-                        .WithMany()
-                        .HasForeignKey("DefaultVendorId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.SubCategory", "SubCategory")
-                        .WithMany()
-                        .HasForeignKey("SubCategoryId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("BaseUom");
-
-                    b.Navigation("Brand");
-
-                    b.Navigation("Category");
-
-                    b.Navigation("DefaultVendor");
-
-                    b.Navigation("SubCategory");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ItemReorder", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany("ReorderSettings")
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Permission", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.NavItem", "NavItem")
-                        .WithMany()
-                        .HasForeignKey("NavItemId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("ERPCore.Domain.Entities.SubNavItem", "SubNavItem")
-                        .WithMany()
-                        .HasForeignKey("SubNavItemId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.Navigation("NavItem");
-
-                    b.Navigation("SubNavItem");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PoLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.PurchaseOrder", "PurchaseOrder")
-                        .WithMany("Lines")
-                        .HasForeignKey("PoId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
-                        .WithMany()
-                        .HasForeignKey("UomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("PurchaseOrder");
-
-                    b.Navigation("Uom");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ProductConfig", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "UpdatedByUser")
-                        .WithMany()
-                        .HasForeignKey("UpdatedBy")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("UpdatedByUser");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseOrder", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Requisition", "Requisition")
-                        .WithMany()
-                        .HasForeignKey("RequisitionId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "Vendor")
-                        .WithMany()
-                        .HasForeignKey("VendorId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("Requisition");
-
-                    b.Navigation("Vendor");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturn", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.ReasonCode", "ReasonCode")
-                        .WithMany()
-                        .HasForeignKey("ReasonCodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "Vendor")
-                        .WithMany()
-                        .HasForeignKey("VendorId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("ReasonCode");
-
-                    b.Navigation("Vendor");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturnLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.GrnLine", "GrnLine")
-                        .WithMany()
-                        .HasForeignKey("GrnLineId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.PurchaseReturn", "Return")
-                        .WithMany("Lines")
-                        .HasForeignKey("ReturnId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("GrnLine");
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Return");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Requisition", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Requester")
-                        .WithMany()
-                        .HasForeignKey("RequestedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Requester");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RequisitionLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Requisition", "Requisition")
-                        .WithMany("Lines")
-                        .HasForeignKey("RequisitionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Requisition");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Rfq", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Requisition", "Requisition")
-                        .WithMany()
-                        .HasForeignKey("RequisitionId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Requisition");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RfqLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Rfq", "Rfq")
-                        .WithMany("Lines")
-                        .HasForeignKey("RfqId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Rfq");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RolePermission", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Permission", "Permission")
-                        .WithMany()
-                        .HasForeignKey("PermissionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Role", "Role")
-                        .WithMany()
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Permission");
-
-                    b.Navigation("Role");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Serial", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustment", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.ReasonCode", "ReasonCode")
-                        .WithMany()
-                        .HasForeignKey("ReasonCodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("ReasonCode");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustmentLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.StockAdjustment", "Adjustment")
-                        .WithMany("Lines")
-                        .HasForeignKey("AdjustmentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Batch", null)
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("BinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Serial", null)
-                        .WithMany()
-                        .HasForeignKey("SerialId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("Adjustment");
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCount", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCountLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("BinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.StockCount", "Count")
-                        .WithMany("Lines")
-                        .HasForeignKey("CountId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Count");
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockLayer", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Batch", "Batch")
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.GrnLine", "GrnLine")
-                        .WithMany()
-                        .HasForeignKey("GrnLineId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Serial", "Serial")
-                        .WithMany()
-                        .HasForeignKey("SerialId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Batch");
-
-                    b.Navigation("GrnLine");
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Serial");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockLedger", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Batch", null)
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("BinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", null)
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Serial", null)
-                        .WithMany()
-                        .HasForeignKey("SerialId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.User", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", null)
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransfer", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "DestWarehouse")
-                        .WithMany()
-                        .HasForeignKey("DestWarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "SrcWarehouse")
-                        .WithMany()
-                        .HasForeignKey("SrcWarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("DestWarehouse");
-
-                    b.Navigation("SrcWarehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransferLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Batch", null)
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("DestBinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Serial", null)
-                        .WithMany()
-                        .HasForeignKey("SerialId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("SrcBinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.StockTransfer", "Transfer")
-                        .WithMany("Lines")
-                        .HasForeignKey("TransferId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Transfer");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.SubCategory", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Category", "Category")
-                        .WithMany("SubCategories")
-                        .HasForeignKey("CategoryId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Category");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.SubNavItem", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.NavItem", "NavItem")
-                        .WithMany("Children")
-                        .HasForeignKey("NavItemId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("NavItem");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.UomConversion", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "FromUom")
-                        .WithMany()
-                        .HasForeignKey("FromUomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany("UomConversions")
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "ToUom")
-                        .WithMany()
-                        .HasForeignKey("ToUomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("FromUom");
-
-                    b.Navigation("Item");
-
-                    b.Navigation("ToUom");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.User", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Role", "Role")
-                        .WithMany()
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("Role");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotation", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Rfq", "Rfq")
-                        .WithMany("Quotations")
-                        .HasForeignKey("RfqId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "Vendor")
-                        .WithMany()
-                        .HasForeignKey("VendorId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Rfq");
-
-                    b.Navigation("Vendor");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotationLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.VendorQuotation", "Quotation")
-                        .WithMany("Lines")
-                        .HasForeignKey("QuotationId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Quotation");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Category", b =>
-                {
-                    b.Navigation("SubCategories");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Grn", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Item", b =>
-                {
-                    b.Navigation("ReorderSettings");
-
-                    b.Navigation("UomConversions");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.NavItem", b =>
-                {
-                    b.Navigation("Children");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseOrder", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturn", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Requisition", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Rfq", b =>
-                {
-                    b.Navigation("Lines");
-
-                    b.Navigation("Quotations");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustment", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCount", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransfer", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotation", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Warehouse", b =>
-                {
-                    b.Navigation("Bins");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/Backend/ERPCore/Infra/Persistence/Migrations/20260718092655_AddRolesNavPermissions.cs b/Backend/ERPCore/Infra/Persistence/Migrations/20260718092655_AddRolesNavPermissions.cs
deleted file mode 100644
index 07ace7f..0000000
--- a/Backend/ERPCore/Infra/Persistence/Migrations/20260718092655_AddRolesNavPermissions.cs
+++ /dev/null
@@ -1,303 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional
-
-namespace ERPCore.Infra.Persistence.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddRolesNavPermissions : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<int>(
-                name: "RoleId",
-                table: "users",
-                type: "integer",
-                nullable: true);
-
-            migrationBuilder.CreateTable(
-                name: "nav_items",
-                columns: table => new
-                {
-                    NavItemId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    Code = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false),
-                    Label = table.Column<string>(type: "character varying(100)", maxLength: 100, nullable: false),
-                    Icon = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: true),
-                    Href = table.Column<string>(type: "character varying(200)", maxLength: 200, nullable: true),
-                    SortOrder = table.Column<int>(type: "integer", nullable: false),
-                    Status = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false, defaultValue: "Active")
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_nav_items", x => x.NavItemId);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "roles",
-                columns: table => new
-                {
-                    RoleId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    auth_role_id = table.Column<Guid>(type: "uuid", nullable: false),
-                    Code = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false),
-                    Name = table.Column<string>(type: "character varying(200)", maxLength: 200, nullable: false),
-                    IsSystemRole = table.Column<bool>(type: "boolean", nullable: false, defaultValue: false),
-                    Status = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false, defaultValue: "Active"),
-                    CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
-                    UpdatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
-                    xmin = table.Column<uint>(type: "xid", rowVersion: true, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_roles", x => x.RoleId);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "sub_nav_items",
-                columns: table => new
-                {
-                    SubNavItemId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    NavItemId = table.Column<int>(type: "integer", nullable: false),
-                    Code = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false),
-                    Label = table.Column<string>(type: "character varying(100)", maxLength: 100, nullable: false),
-                    Icon = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: true),
-                    Href = table.Column<string>(type: "character varying(200)", maxLength: 200, nullable: true),
-                    SortOrder = table.Column<int>(type: "integer", nullable: false),
-                    Status = table.Column<string>(type: "character varying(20)", maxLength: 20, nullable: false, defaultValue: "Active")
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_sub_nav_items", x => x.SubNavItemId);
-                    table.ForeignKey(
-                        name: "FK_sub_nav_items_nav_items_NavItemId",
-                        column: x => x.NavItemId,
-                        principalTable: "nav_items",
-                        principalColumn: "NavItemId",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "permissions",
-                columns: table => new
-                {
-                    PermissionId = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    Code = table.Column<string>(type: "character varying(80)", maxLength: 80, nullable: false),
-                    NavItemId = table.Column<int>(type: "integer", nullable: true),
-                    SubNavItemId = table.Column<int>(type: "integer", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_permissions", x => x.PermissionId);
-                    table.ForeignKey(
-                        name: "FK_permissions_nav_items_NavItemId",
-                        column: x => x.NavItemId,
-                        principalTable: "nav_items",
-                        principalColumn: "NavItemId",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_permissions_sub_nav_items_SubNavItemId",
-                        column: x => x.SubNavItemId,
-                        principalTable: "sub_nav_items",
-                        principalColumn: "SubNavItemId",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "role_permissions",
-                columns: table => new
-                {
-                    RoleId = table.Column<int>(type: "integer", nullable: false),
-                    PermissionId = table.Column<int>(type: "integer", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_role_permissions", x => new { x.RoleId, x.PermissionId });
-                    table.ForeignKey(
-                        name: "FK_role_permissions_permissions_PermissionId",
-                        column: x => x.PermissionId,
-                        principalTable: "permissions",
-                        principalColumn: "PermissionId",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_role_permissions_roles_RoleId",
-                        column: x => x.RoleId,
-                        principalTable: "roles",
-                        principalColumn: "RoleId",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.InsertData(
-                table: "nav_items",
-                columns: new[] { "NavItemId", "Code", "Href", "Icon", "Label", "SortOrder" },
-                values: new object[,]
-                {
-                    { 1, "dashboard", "/dashboard", null, "Dashboard", 1 },
-                    { 2, "products", "/dashboard/products", null, "Products", 2 },
-                    { 3, "vendors", "/dashboard/vendors", null, "Vendors", 3 },
-                    { 4, "procurement", "/dashboard/procurement", null, "Procurement", 4 },
-                    { 5, "receiving", "/dashboard/receiving/grn", null, "Receiving", 5 },
-                    { 6, "stock", "/dashboard/stock", null, "Stock", 6 },
-                    { 7, "warehouses", "/dashboard/warehouse", null, "Warehouses", 7 },
-                    { 8, "orders", "/dashboard/orders", null, "Orders", 8 },
-                    { 9, "settings", "/dashboard/settings", null, "Settings", 9 },
-                    { 10, "help", "/dashboard/help", null, "Help", 10 }
-                });
-
-            migrationBuilder.UpdateData(
-                table: "users",
-                keyColumn: "UserId",
-                keyValue: 1,
-                column: "RoleId",
-                value: null);
-
-            migrationBuilder.InsertData(
-                table: "permissions",
-                columns: new[] { "PermissionId", "Code", "NavItemId", "SubNavItemId" },
-                values: new object[,]
-                {
-                    { 1, "NAV:dashboard", 1, null },
-                    { 2, "NAV:products", 2, null },
-                    { 3, "NAV:vendors", 3, null },
-                    { 4, "NAV:procurement", 4, null },
-                    { 5, "NAV:receiving", 5, null },
-                    { 6, "NAV:stock", 6, null },
-                    { 7, "NAV:warehouses", 7, null },
-                    { 8, "NAV:orders", 8, null },
-                    { 9, "NAV:settings", 9, null },
-                    { 10, "NAV:help", 10, null }
-                });
-
-            migrationBuilder.InsertData(
-                table: "sub_nav_items",
-                columns: new[] { "SubNavItemId", "Code", "Href", "Icon", "Label", "NavItemId", "SortOrder" },
-                values: new object[,]
-                {
-                    { 1, "products.item", "/dashboard/products", null, "Item", 2, 1 },
-                    { 2, "products.category", "/dashboard/products/categories", null, "Category", 2, 2 },
-                    { 3, "products.brand", "/dashboard/products/brands", null, "Brand", 2, 3 },
-                    { 4, "products.item-type", "/dashboard/products/item-types", null, "Item Type", 2, 4 },
-                    { 5, "products.uom", "/dashboard/products/uoms", null, "UOM", 2, 5 },
-                    { 6, "products.configuration", "/dashboard/products/settings", null, "Configuration", 2, 6 },
-                    { 7, "settings.roles", "/dashboard/settings/roles", null, "Roles", 9, 1 },
-                    { 8, "settings.users", "/dashboard/settings/users", null, "Users", 9, 2 }
-                });
-
-            migrationBuilder.InsertData(
-                table: "permissions",
-                columns: new[] { "PermissionId", "Code", "NavItemId", "SubNavItemId" },
-                values: new object[,]
-                {
-                    { 11, "NAV:products.item", null, 1 },
-                    { 12, "NAV:products.category", null, 2 },
-                    { 13, "NAV:products.brand", null, 3 },
-                    { 14, "NAV:products.item-type", null, 4 },
-                    { 15, "NAV:products.uom", null, 5 },
-                    { 16, "NAV:products.configuration", null, 6 },
-                    { 17, "NAV:settings.roles", null, 7 },
-                    { 18, "NAV:settings.users", null, 8 }
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_users_RoleId",
-                table: "users",
-                column: "RoleId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_nav_items_Code",
-                table: "nav_items",
-                column: "Code",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_permissions_Code",
-                table: "permissions",
-                column: "Code",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_permissions_NavItemId",
-                table: "permissions",
-                column: "NavItemId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_permissions_SubNavItemId",
-                table: "permissions",
-                column: "SubNavItemId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_role_permissions_PermissionId",
-                table: "role_permissions",
-                column: "PermissionId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_roles_auth_role_id",
-                table: "roles",
-                column: "auth_role_id",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_roles_Code",
-                table: "roles",
-                column: "Code",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_sub_nav_items_Code",
-                table: "sub_nav_items",
-                column: "Code",
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_sub_nav_items_NavItemId",
-                table: "sub_nav_items",
-                column: "NavItemId");
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_users_roles_RoleId",
-                table: "users",
-                column: "RoleId",
-                principalTable: "roles",
-                principalColumn: "RoleId",
-                onDelete: ReferentialAction.Restrict);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_users_roles_RoleId",
-                table: "users");
-
-            migrationBuilder.DropTable(
-                name: "role_permissions");
-
-            migrationBuilder.DropTable(
-                name: "permissions");
-
-            migrationBuilder.DropTable(
-                name: "roles");
-
-            migrationBuilder.DropTable(
-                name: "sub_nav_items");
-
-            migrationBuilder.DropTable(
-                name: "nav_items");
-
-            migrationBuilder.DropIndex(
-                name: "IX_users_RoleId",
-                table: "users");
-
-            migrationBuilder.DropColumn(
-                name: "RoleId",
-                table: "users");
-        }
-    }
-}
diff --git a/Backend/ERPCore/Infra/Persistence/Migrations/ErpDbContextModelSnapshot.cs b/Backend/ERPCore/Infra/Persistence/Migrations/ErpDbContextModelSnapshot.cs
deleted file mode 100644
index c484971..0000000
--- a/Backend/ERPCore/Infra/Persistence/Migrations/ErpDbContextModelSnapshot.cs
+++ /dev/null
@@ -1,5861 +0,0 @@
-// <auto-generated />
-using System;
-using ERPCore.Infra.Persistence;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace ERPCore.Infra.Persistence.Migrations
-{
-    [DbContext(typeof(ErpDbContext))]
-    partial class ErpDbContextModelSnapshot : ModelSnapshot
-    {
-        protected override void BuildModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "10.0.9")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.AttendanceRecord", b =>
-                {
-                    b.Property<int>("AttendanceRecordId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("AttendanceRecordId"));
-
-                    b.Property<DateTime>("AttendanceDate")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("AttendanceStatus")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int?>("AttendanceUploadBatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<TimeSpan?>("CheckIn")
-                        .HasColumnType("interval");
-
-                    b.Property<TimeSpan?>("CheckOut")
-                        .HasColumnType("interval");
-
-                    b.Property<int?>("DuplicateOfAttendanceRecordId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("EarlyLeaveMinutes")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime?>("EditedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int?>("EditedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("EmployeeId")
-                        .HasColumnType("integer");
-
-                    b.Property<bool>("IsManualOverride")
-                        .HasColumnType("boolean");
-
-                    b.Property<int>("LateMinutes")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1000)
-                        .HasColumnType("character varying(1000)");
-
-                    b.Property<int>("OvertimeMinutes")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("RowValidationStatus")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<int>("WorkShiftId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WorkingMinutes")
-                        .HasColumnType("integer");
-
-                    b.HasKey("AttendanceRecordId");
-
-                    b.HasIndex("AttendanceUploadBatchId");
-
-                    b.HasIndex("WorkShiftId");
-
-                    b.HasIndex("EmployeeId", "AttendanceDate");
-
-                    b.ToTable("hr_attendance_records", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.AttendanceUploadBatch", b =>
-                {
-                    b.Property<int>("AttendanceUploadBatchId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("AttendanceUploadBatchId"));
-
-                    b.Property<DateTime?>("ConfirmedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int?>("ConfirmedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<string>("OriginalFileName")
-                        .HasMaxLength(260)
-                        .HasColumnType("character varying(260)");
-
-                    b.Property<DateTime>("PeriodEnd")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<DateTime>("PeriodStart")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("RowCountDuplicate")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("RowCountError")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("RowCountTotal")
-                        .HasColumnType("integer");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("SourceType")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime>("UploadedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("UploadedBy")
-                        .HasColumnType("integer");
-
-                    b.HasKey("AttendanceUploadBatchId");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("PeriodStart", "PeriodEnd");
-
-                    b.ToTable("hr_attendance_upload_batches", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.AuditLog", b =>
-                {
-                    b.Property<int>("AuditId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("AuditId"));
-
-                    b.Property<string>("Action")
-                        .IsRequired()
-                        .HasMaxLength(10)
-                        .HasColumnType("character varying(10)");
-
-                    b.Property<string>("ChangeSet")
-                        .IsRequired()
-                        .HasColumnType("jsonb");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("EntityId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("EntityType")
-                        .IsRequired()
-                        .HasMaxLength(80)
-                        .HasColumnType("character varying(80)");
-
-                    b.Property<int>("UserId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("AuditId");
-
-                    b.HasIndex("CreatedAt");
-
-                    b.HasIndex("UserId");
-
-                    b.HasIndex("EntityType", "EntityId");
-
-                    b.ToTable("audit_logs", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Batch", b =>
-                {
-                    b.Property<int>("BatchId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("BatchId"));
-
-                    b.Property<string>("BatchNo")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<DateOnly?>("ExpiryDate")
-                        .HasColumnType("date");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("BatchId");
-
-                    b.HasIndex("ItemId", "BatchNo")
-                        .IsUnique();
-
-                    b.ToTable("batches", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Bin", b =>
-                {
-                    b.Property<int>("BinId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("BinId"));
-
-                    b.Property<string>("BinType")
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("BinId");
-
-                    b.HasIndex("WarehouseId", "Code")
-                        .IsUnique();
-
-                    b.ToTable("bins", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Branch", b =>
-                {
-                    b.Property<int>("BranchId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("BranchId"));
-
-                    b.Property<string>("Address")
-                        .HasMaxLength(500)
-                        .HasColumnType("character varying(500)");
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("BranchId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("hr_branches", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Brand", b =>
-                {
-                    b.Property<int>("BrandId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("BrandId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("BrandId");
-
-                    b.HasIndex("Name")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("brands", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Category", b =>
-                {
-                    b.Property<int>("CategoryId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CategoryId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("CategoryId");
-
-                    b.HasIndex("Name")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("categories", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Department", b =>
-                {
-                    b.Property<int>("DepartmentId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("DepartmentId"));
-
-                    b.Property<int?>("BranchId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int?>("HeadEmployeeId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<int?>("ParentDepartmentId")
-                        .HasColumnType("integer");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("DepartmentId");
-
-                    b.HasIndex("BranchId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.HasIndex("HeadEmployeeId");
-
-                    b.HasIndex("ParentDepartmentId");
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("hr_departments", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Designation", b =>
-                {
-                    b.Property<int>("DesignationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("DesignationId"));
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("DesignationId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("hr_designations", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Employee", b =>
-                {
-                    b.Property<int>("EmployeeId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("EmployeeId"));
-
-                    b.Property<string>("AddressLine1")
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<string>("AddressLine2")
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<int?>("BranchId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("City")
-                        .HasMaxLength(100)
-                        .HasColumnType("character varying(100)");
-
-                    b.Property<DateTime?>("ConfirmationDate")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Country")
-                        .HasMaxLength(100)
-                        .HasColumnType("character varying(100)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime?>("DateOfBirth")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("DepartmentId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("DesignationId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Email")
-                        .HasMaxLength(320)
-                        .HasColumnType("character varying(320)");
-
-                    b.Property<string>("EmergencyContactName")
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<string>("EmergencyContactPhone")
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<string>("EmergencyContactRelationship")
-                        .HasMaxLength(100)
-                        .HasColumnType("character varying(100)");
-
-                    b.Property<string>("EmployeeCode")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int>("EmploymentTypeId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("EpfNumber")
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<string>("EtfNumber")
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<string>("FullName")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<string>("Gender")
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime>("HireDate")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<DateTime?>("LastWorkingDate")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Nationality")
-                        .HasMaxLength(100)
-                        .HasColumnType("character varying(100)");
-
-                    b.Property<string>("Nic")
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<string>("PersonalMobile")
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<string>("PostalCode")
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("ProfilePhotoPath")
-                        .HasMaxLength(500)
-                        .HasColumnType("character varying(500)");
-
-                    b.Property<int?>("ReportingManagerId")
-                        .HasColumnType("integer");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<string>("TaxIdentificationNumber")
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int?>("UpdatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("UserId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WorkShiftId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("EmployeeId");
-
-                    b.HasIndex("BranchId");
-
-                    b.HasIndex("DepartmentId");
-
-                    b.HasIndex("DesignationId");
-
-                    b.HasIndex("Email");
-
-                    b.HasIndex("EmployeeCode")
-                        .IsUnique();
-
-                    b.HasIndex("EmploymentTypeId");
-
-                    b.HasIndex("ReportingManagerId");
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("UserId")
-                        .IsUnique();
-
-                    b.HasIndex("WorkShiftId");
-
-                    b.ToTable("hr_employees", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.EmployeeBankDetail", b =>
-                {
-                    b.Property<int>("EmployeeBankDetailId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("EmployeeBankDetailId"));
-
-                    b.Property<string>("AccountHolderName")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<string>("AccountNumber")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("BankName")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<string>("BranchName")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("EmployeeId")
-                        .HasColumnType("integer");
-
-                    b.Property<bool>("IsPrimary")
-                        .HasColumnType("boolean");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<string>("SwiftCode")
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("EmployeeBankDetailId");
-
-                    b.HasIndex("EmployeeId");
-
-                    b.ToTable("hr_employee_bank_details", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.EmployeeDocument", b =>
-                {
-                    b.Property<int>("EmployeeDocumentId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("EmployeeDocumentId"));
-
-                    b.Property<string>("ContentType")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<int>("EmployeeId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime?>("ExpiryDate")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("HrDocumentTypeId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime?>("IssueDate")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Notes")
-                        .HasMaxLength(1000)
-                        .HasColumnType("character varying(1000)");
-
-                    b.Property<string>("OriginalFileName")
-                        .IsRequired()
-                        .HasMaxLength(260)
-                        .HasColumnType("character varying(260)");
-
-                    b.Property<string>("RelativePath")
-                        .IsRequired()
-                        .HasMaxLength(500)
-                        .HasColumnType("character varying(500)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<long>("SizeBytes")
-                        .HasColumnType("bigint");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<string>("StoredFileName")
-                        .IsRequired()
-                        .HasMaxLength(260)
-                        .HasColumnType("character varying(260)");
-
-                    b.Property<DateTime>("UploadedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("UploadedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime?>("VerifiedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int?>("VerifiedBy")
-                        .HasColumnType("integer");
-
-                    b.HasKey("EmployeeDocumentId");
-
-                    b.HasIndex("EmployeeId");
-
-                    b.HasIndex("ExpiryDate");
-
-                    b.HasIndex("HrDocumentTypeId");
-
-                    b.ToTable("hr_employee_documents", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.EmployeeLoan", b =>
-                {
-                    b.Property<int>("EmployeeLoanId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("EmployeeLoanId"));
-
-                    b.Property<DateTime>("ApprovedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("ApprovedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int>("EmployeeId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("InstallmentAmount")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("numeric(18,2)");
-
-                    b.Property<decimal>("InterestRate")
-                        .HasPrecision(6, 4)
-                        .HasColumnType("numeric(6,4)");
-
-                    b.Property<string>("LoanKind")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("NumberOfInstallments")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("OutstandingBalance")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("numeric(18,2)");
-
-                    b.Property<decimal>("PrincipalAmount")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("numeric(18,2)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<int>("StartMonth")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("StartYear")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("EmployeeLoanId");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("EmployeeId");
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("hr_employee_loans", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.EmployeeSalaryStructure", b =>
-                {
-                    b.Property<int>("EmployeeSalaryStructureId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("EmployeeSalaryStructureId"));
-
-                    b.Property<DateTime>("ApprovedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("ApprovedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("BasicSalary")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("numeric(18,2)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Currency")
-                        .IsRequired()
-                        .HasMaxLength(3)
-                        .HasColumnType("character varying(3)");
-
-                    b.Property<DateTime>("EffectiveFrom")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<DateTime?>("EffectiveTo")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("EmployeeId")
-                        .HasColumnType("integer");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("EmployeeSalaryStructureId");
-
-                    b.HasIndex("EmployeeId", "EffectiveTo");
-
-                    b.ToTable("hr_employee_salary_structures", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.EmployeeSalaryStructureLine", b =>
-                {
-                    b.Property<int>("EmployeeSalaryStructureLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("EmployeeSalaryStructureLineId"));
-
-                    b.Property<decimal>("Amount")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("numeric(18,2)");
-
-                    b.Property<int>("EmployeeSalaryStructureId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("SalaryComponentId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("EmployeeSalaryStructureLineId");
-
-                    b.HasIndex("EmployeeSalaryStructureId");
-
-                    b.HasIndex("SalaryComponentId");
-
-                    b.ToTable("hr_employee_salary_structure_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.EmploymentType", b =>
-                {
-                    b.Property<int>("EmploymentTypeId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("EmploymentTypeId"));
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("EmploymentTypeId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("hr_employment_types", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Grn", b =>
-                {
-                    b.Property<int>("GrnId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GrnId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int?>("PoId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime?>("PostedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("VendorId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("GrnId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("PoId");
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("VendorId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("grns", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.GrnLine", b =>
-                {
-                    b.Property<int>("GrnLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GrnLineId"));
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BinId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("DiscountPct")
-                        .HasPrecision(9, 4)
-                        .HasColumnType("numeric(9,4)");
-
-                    b.Property<int>("GrnId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("HoldStatus")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("LineTotal")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("NetUnitCost")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.Property<int?>("PoLineId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal?>("PoUnitPrice")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("ReceivedValue")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("UnitCost")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.Property<int>("UomId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("VatAmount")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("VatPct")
-                        .HasPrecision(9, 4)
-                        .HasColumnType("numeric(9,4)");
-
-                    b.HasKey("GrnLineId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("BinId");
-
-                    b.HasIndex("GrnId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("PoLineId");
-
-                    b.HasIndex("UomId");
-
-                    b.ToTable("grn_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.HrDocumentType", b =>
-                {
-                    b.Property<int>("HrDocumentTypeId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("HrDocumentTypeId"));
-
-                    b.Property<string>("Category")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<bool>("ExpiryTracked")
-                        .HasColumnType("boolean");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<bool>("RequiredAtOnboarding")
-                        .HasColumnType("boolean");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("HrDocumentTypeId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("hr_document_types", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Item", b =>
-                {
-                    b.Property<int>("ItemId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ItemId"));
-
-                    b.Property<int>("BaseUomId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BrandId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("CategoryId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int?>("DefaultVendorId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Description")
-                        .HasMaxLength(1000)
-                        .HasColumnType("character varying(1000)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<decimal?>("SalePrice")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<string>("Sku")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<string>("StockNature")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int?>("SubCategoryId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("TaxClass")
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("TrackingMode")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("ItemId");
-
-                    b.HasIndex("BaseUomId");
-
-                    b.HasIndex("BrandId");
-
-                    b.HasIndex("CategoryId");
-
-                    b.HasIndex("DefaultVendorId");
-
-                    b.HasIndex("Sku")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("SubCategoryId");
-
-                    b.ToTable("items", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ItemReorder", b =>
-                {
-                    b.Property<int>("ReorderId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReorderId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("ReorderPoint")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("ReorderQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ReorderId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.HasIndex("ItemId", "WarehouseId")
-                        .IsUnique();
-
-                    b.ToTable("item_reorders", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ItemType", b =>
-                {
-                    b.Property<int>("ItemTypeId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ItemTypeId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("ItemTypeId");
-
-                    b.HasIndex("Name")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("item_types", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.JournalEntryStub", b =>
-                {
-                    b.Property<int>("JournalId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("JournalId"));
-
-                    b.Property<decimal>("Amount")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<string>("CreditAccount")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("DebitAccount")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("SourceDocId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("SourceDocType")
-                        .IsRequired()
-                        .HasMaxLength(10)
-                        .HasColumnType("character varying(10)");
-
-                    b.HasKey("JournalId");
-
-                    b.HasIndex("SourceDocType", "SourceDocId");
-
-                    b.ToTable("journal_entry_stubs", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.LeaveBalance", b =>
-                {
-                    b.Property<int>("LeaveBalanceId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("LeaveBalanceId"));
-
-                    b.Property<decimal>("AdjustmentDays")
-                        .HasPrecision(6, 2)
-                        .HasColumnType("numeric(6,2)");
-
-                    b.Property<decimal>("CarriedForwardDays")
-                        .HasPrecision(6, 2)
-                        .HasColumnType("numeric(6,2)");
-
-                    b.Property<int>("EmployeeId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("EntitledDays")
-                        .HasPrecision(6, 2)
-                        .HasColumnType("numeric(6,2)");
-
-                    b.Property<int>("LeaveTypeId")
-                        .HasColumnType("integer");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<decimal>("TakenDays")
-                        .HasPrecision(6, 2)
-                        .HasColumnType("numeric(6,2)");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("Year")
-                        .HasColumnType("integer");
-
-                    b.HasKey("LeaveBalanceId");
-
-                    b.HasIndex("LeaveTypeId");
-
-                    b.HasIndex("EmployeeId", "LeaveTypeId", "Year")
-                        .IsUnique();
-
-                    b.ToTable("hr_leave_balances", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.LeaveRequest", b =>
-                {
-                    b.Property<int>("LeaveRequestId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("LeaveRequestId"));
-
-                    b.Property<DateTime?>("ApprovedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int?>("ApprovedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("DaysCount")
-                        .HasPrecision(6, 2)
-                        .HasColumnType("numeric(6,2)");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int>("EmployeeId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("EndDate")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("LeaveTypeId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Reason")
-                        .HasMaxLength(1000)
-                        .HasColumnType("character varying(1000)");
-
-                    b.Property<string>("RejectionReason")
-                        .HasMaxLength(1000)
-                        .HasColumnType("character varying(1000)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<DateTime>("StartDate")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("LeaveRequestId");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("EmployeeId");
-
-                    b.HasIndex("LeaveTypeId");
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("StartDate", "EndDate");
-
-                    b.ToTable("hr_leave_requests", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.LeaveType", b =>
-                {
-                    b.Property<int>("LeaveTypeId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("LeaveTypeId"));
-
-                    b.Property<decimal>("AccrualPerYear")
-                        .HasPrecision(6, 2)
-                        .HasColumnType("numeric(6,2)");
-
-                    b.Property<bool>("CarryForwardAllowed")
-                        .HasColumnType("boolean");
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<bool>("CountsAsNoPay")
-                        .HasColumnType("boolean");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<bool>("IsPaid")
-                        .HasColumnType("boolean");
-
-                    b.Property<int?>("MaxCarryForwardDays")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<bool>("RequiresApproval")
-                        .HasColumnType("boolean");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("LeaveTypeId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("hr_leave_types", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.LoanInstallment", b =>
-                {
-                    b.Property<int>("LoanInstallmentId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("LoanInstallmentId"));
-
-                    b.Property<int>("DueMonth")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("DueYear")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("EmployeeLoanId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("InstallmentNumber")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal?>("PaidAmount")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("numeric(18,2)");
-
-                    b.Property<int?>("PayrollRunId")
-                        .HasColumnType("integer");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<decimal>("ScheduledAmount")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("numeric(18,2)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("LoanInstallmentId");
-
-                    b.HasIndex("EmployeeLoanId");
-
-                    b.HasIndex("PayrollRunId");
-
-                    b.HasIndex("DueYear", "DueMonth");
-
-                    b.ToTable("hr_loan_installments", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.NavItem", b =>
-                {
-                    b.Property<int>("NavItemId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("NavItemId"));
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Href")
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<string>("Icon")
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("character varying(100)");
-
-                    b.Property<int>("SortOrder")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.HasKey("NavItemId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.ToTable("nav_items", (string)null);
-
-                    b.HasData(
-                        new
-                        {
-                            NavItemId = 1,
-                            Code = "dashboard",
-                            Href = "/dashboard",
-                            Label = "Dashboard",
-                            SortOrder = 1,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            NavItemId = 2,
-                            Code = "products",
-                            Href = "/dashboard/products",
-                            Label = "Products",
-                            SortOrder = 2,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            NavItemId = 3,
-                            Code = "vendors",
-                            Href = "/dashboard/vendors",
-                            Label = "Vendors",
-                            SortOrder = 3,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            NavItemId = 4,
-                            Code = "procurement",
-                            Href = "/dashboard/procurement",
-                            Label = "Procurement",
-                            SortOrder = 4,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            NavItemId = 5,
-                            Code = "receiving",
-                            Href = "/dashboard/receiving/grn",
-                            Label = "Receiving",
-                            SortOrder = 5,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            NavItemId = 6,
-                            Code = "stock",
-                            Href = "/dashboard/stock",
-                            Label = "Stock",
-                            SortOrder = 6,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            NavItemId = 7,
-                            Code = "warehouses",
-                            Href = "/dashboard/warehouse",
-                            Label = "Warehouses",
-                            SortOrder = 7,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            NavItemId = 8,
-                            Code = "orders",
-                            Href = "/dashboard/orders",
-                            Label = "Orders",
-                            SortOrder = 8,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            NavItemId = 9,
-                            Code = "settings",
-                            Href = "/dashboard/settings",
-                            Label = "Settings",
-                            SortOrder = 9,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            NavItemId = 10,
-                            Code = "help",
-                            Href = "/dashboard/help",
-                            Label = "Help",
-                            SortOrder = 10,
-                            Status = "Active"
-                        });
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.NumberSequence", b =>
-                {
-                    b.Property<int>("SequenceId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("SequenceId"));
-
-                    b.Property<string>("DocType")
-                        .IsRequired()
-                        .HasMaxLength(10)
-                        .HasColumnType("character varying(10)")
-                        .HasColumnName("doc_type");
-
-                    b.Property<int>("LastNumber")
-                        .HasColumnType("integer")
-                        .HasColumnName("last_number");
-
-                    b.Property<int>("Year")
-                        .HasColumnType("integer")
-                        .HasColumnName("year");
-
-                    b.HasKey("SequenceId");
-
-                    b.HasIndex("DocType", "Year")
-                        .IsUnique();
-
-                    b.ToTable("number_sequences", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PayrollLine", b =>
-                {
-                    b.Property<int>("PayrollLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("PayrollLineId"));
-
-                    b.Property<int>("AbsentDays")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("BasicSalary")
-                        .HasColumnType("numeric(18,2)");
-
-                    b.Property<int>("EmployeeId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("EpfEmployeeAmount")
-                        .HasColumnType("numeric(18,2)");
-
-                    b.Property<decimal>("EpfEmployerAmount")
-                        .HasColumnType("numeric(18,2)");
-
-                    b.Property<decimal>("EtfEmployerAmount")
-                        .HasColumnType("numeric(18,2)");
-
-                    b.Property<decimal>("GrossSalary")
-                        .HasColumnType("numeric(18,2)");
-
-                    b.Property<decimal>("LateDeductionAmount")
-                        .HasColumnType("numeric(18,2)");
-
-                    b.Property<int>("LateMinutesTotal")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("LeaveDays")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("LoanDeductionAmount")
-                        .HasColumnType("numeric(18,2)");
-
-                    b.Property<decimal>("NetSalary")
-                        .HasColumnType("numeric(18,2)");
-
-                    b.Property<decimal>("NoPayAmount")
-                        .HasColumnType("numeric(18,2)");
-
-                    b.Property<int>("OtMinutesTotal")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("OtherDeductionsAmount")
-                        .HasColumnType("numeric(18,2)");
-
-                    b.Property<decimal>("OvertimeAmount")
-                        .HasColumnType("numeric(18,2)");
-
-                    b.Property<int>("PayrollRunId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("PresentDays")
-                        .HasColumnType("integer");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<decimal>("TaxAmount")
-                        .HasColumnType("numeric(18,2)");
-
-                    b.Property<decimal>("TotalAllowances")
-                        .HasColumnType("numeric(18,2)");
-
-                    b.Property<int>("WorkingDays")
-                        .HasColumnType("integer");
-
-                    b.HasKey("PayrollLineId");
-
-                    b.HasIndex("EmployeeId");
-
-                    b.HasIndex("PayrollRunId", "EmployeeId")
-                        .IsUnique();
-
-                    b.ToTable("hr_payroll_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PayrollLineComponent", b =>
-                {
-                    b.Property<int>("PayrollLineComponentId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("PayrollLineComponentId"));
-
-                    b.Property<decimal>("Amount")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("numeric(18,2)");
-
-                    b.Property<string>("ComponentCategory")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<int>("PayrollLineId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("SalaryComponentId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("SortOrder")
-                        .HasColumnType("integer");
-
-                    b.HasKey("PayrollLineComponentId");
-
-                    b.HasIndex("PayrollLineId");
-
-                    b.HasIndex("SalaryComponentId");
-
-                    b.ToTable("hr_payroll_line_components", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PayrollRun", b =>
-                {
-                    b.Property<int>("PayrollRunId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("PayrollRunId"));
-
-                    b.Property<DateTime?>("ApprovedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int?>("ApprovedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BranchId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<DateTime>("GeneratedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("GeneratedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime?>("LockedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int?>("LockedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("PeriodMonth")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("PeriodYear")
-                        .HasColumnType("integer");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("UnlockReason")
-                        .HasMaxLength(500)
-                        .HasColumnType("character varying(500)");
-
-                    b.Property<DateTime?>("UnlockedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int?>("UnlockedBy")
-                        .HasColumnType("integer");
-
-                    b.HasKey("PayrollRunId");
-
-                    b.HasIndex("BranchId");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("PeriodYear", "PeriodMonth", "BranchId");
-
-                    b.ToTable("hr_payroll_runs", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PayrollStatutorySetting", b =>
-                {
-                    b.Property<int>("PayrollStatutorySettingId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("PayrollStatutorySettingId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("EffectiveFrom")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<DateTime?>("EffectiveTo")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<decimal>("EpfEmployeeRate")
-                        .HasPrecision(6, 4)
-                        .HasColumnType("numeric(6,4)");
-
-                    b.Property<decimal>("EpfEmployerRate")
-                        .HasPrecision(6, 4)
-                        .HasColumnType("numeric(6,4)");
-
-                    b.Property<decimal>("EtfEmployerRate")
-                        .HasPrecision(6, 4)
-                        .HasColumnType("numeric(6,4)");
-
-                    b.Property<decimal>("OtMultiplierDefault")
-                        .HasPrecision(6, 2)
-                        .HasColumnType("numeric(6,2)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.HasKey("PayrollStatutorySettingId");
-
-                    b.HasIndex("EffectiveFrom");
-
-                    b.ToTable("hr_payroll_statutory_settings", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Payslip", b =>
-                {
-                    b.Property<int>("PayslipId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("PayslipId"));
-
-                    b.Property<DateTime>("GeneratedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("PayrollLineId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime?>("ReleasedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int?>("ReleasedBy")
-                        .HasColumnType("integer");
-
-                    b.HasKey("PayslipId");
-
-                    b.HasIndex("PayrollLineId")
-                        .IsUnique();
-
-                    b.ToTable("hr_payslips", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Permission", b =>
-                {
-                    b.Property<int>("PermissionId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("PermissionId"));
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(80)
-                        .HasColumnType("character varying(80)");
-
-                    b.Property<int?>("NavItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("SubNavItemId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("PermissionId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.HasIndex("NavItemId");
-
-                    b.HasIndex("SubNavItemId");
-
-                    b.ToTable("permissions", (string)null);
-
-                    b.HasData(
-                        new
-                        {
-                            PermissionId = 1,
-                            Code = "NAV:dashboard",
-                            NavItemId = 1
-                        },
-                        new
-                        {
-                            PermissionId = 2,
-                            Code = "NAV:products",
-                            NavItemId = 2
-                        },
-                        new
-                        {
-                            PermissionId = 3,
-                            Code = "NAV:vendors",
-                            NavItemId = 3
-                        },
-                        new
-                        {
-                            PermissionId = 4,
-                            Code = "NAV:procurement",
-                            NavItemId = 4
-                        },
-                        new
-                        {
-                            PermissionId = 5,
-                            Code = "NAV:receiving",
-                            NavItemId = 5
-                        },
-                        new
-                        {
-                            PermissionId = 6,
-                            Code = "NAV:stock",
-                            NavItemId = 6
-                        },
-                        new
-                        {
-                            PermissionId = 7,
-                            Code = "NAV:warehouses",
-                            NavItemId = 7
-                        },
-                        new
-                        {
-                            PermissionId = 8,
-                            Code = "NAV:orders",
-                            NavItemId = 8
-                        },
-                        new
-                        {
-                            PermissionId = 9,
-                            Code = "NAV:settings",
-                            NavItemId = 9
-                        },
-                        new
-                        {
-                            PermissionId = 10,
-                            Code = "NAV:help",
-                            NavItemId = 10
-                        },
-                        new
-                        {
-                            PermissionId = 11,
-                            Code = "NAV:products.item",
-                            SubNavItemId = 1
-                        },
-                        new
-                        {
-                            PermissionId = 12,
-                            Code = "NAV:products.category",
-                            SubNavItemId = 2
-                        },
-                        new
-                        {
-                            PermissionId = 13,
-                            Code = "NAV:products.brand",
-                            SubNavItemId = 3
-                        },
-                        new
-                        {
-                            PermissionId = 14,
-                            Code = "NAV:products.item-type",
-                            SubNavItemId = 4
-                        },
-                        new
-                        {
-                            PermissionId = 15,
-                            Code = "NAV:products.uom",
-                            SubNavItemId = 5
-                        },
-                        new
-                        {
-                            PermissionId = 16,
-                            Code = "NAV:products.configuration",
-                            SubNavItemId = 6
-                        },
-                        new
-                        {
-                            PermissionId = 17,
-                            Code = "NAV:settings.roles",
-                            SubNavItemId = 7
-                        },
-                        new
-                        {
-                            PermissionId = 18,
-                            Code = "NAV:settings.users",
-                            SubNavItemId = 8
-                        },
-                        new
-                        {
-                            PermissionId = 19,
-                            Code = "NAV:procurement.requisitions",
-                            SubNavItemId = 9
-                        },
-                        new
-                        {
-                            PermissionId = 20,
-                            Code = "NAV:procurement.rfqs",
-                            SubNavItemId = 10
-                        },
-                        new
-                        {
-                            PermissionId = 21,
-                            Code = "NAV:procurement.purchase-orders",
-                            SubNavItemId = 11
-                        },
-                        new
-                        {
-                            PermissionId = 22,
-                            Code = "NAV:procurement.purchase-returns",
-                            SubNavItemId = 12
-                        });
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PoLine", b =>
-                {
-                    b.Property<int>("PoLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("PoLineId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("PoId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("QtyReceived")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("Tax")
-                        .HasPrecision(9, 4)
-                        .HasColumnType("numeric(9,4)");
-
-                    b.Property<decimal>("UnitPrice")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("UomId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("PoLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("PoId");
-
-                    b.HasIndex("UomId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("po_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ProductConfig", b =>
-                {
-                    b.Property<int>("ConfigId")
-                        .HasColumnType("integer");
-
-                    b.Property<bool>("BrandsEnabled")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("boolean")
-                        .HasDefaultValue(true);
-
-                    b.Property<bool>("ItemTypesEnabled")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("boolean")
-                        .HasDefaultValue(true);
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<bool>("SubcategoriesEnabled")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("boolean")
-                        .HasDefaultValue(true);
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int?>("UpdatedBy")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ConfigId");
-
-                    b.HasIndex("UpdatedBy");
-
-                    b.ToTable("product_config", null, t =>
-                        {
-                            t.HasCheckConstraint("ck_product_config_singleton", "\"ConfigId\" = 1");
-                        });
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ProductionRun", b =>
-                {
-                    b.Property<int>("RunId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RunId"));
-
-                    b.Property<int?>("CancelReasonCodeId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime?>("CompletedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int?>("OutputBinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ReworkCount")
-                        .HasColumnType("integer");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<decimal>("ScaleFactor")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<decimal>("TargetQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("TemplateId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("RunId");
-
-                    b.HasIndex("CancelReasonCodeId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("OutputBinId");
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.HasIndex("TemplateId", "Status");
-
-                    b.ToTable("production_runs", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ProductionTemplate", b =>
-                {
-                    b.Property<int>("TemplateId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TemplateId"));
-
-                    b.Property<string>("Annotations")
-                        .HasColumnType("jsonb");
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Description")
-                        .HasMaxLength(500)
-                        .HasColumnType("character varying(500)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(150)
-                        .HasColumnType("character varying(150)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("TemplateId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("production_templates", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseOrder", b =>
-                {
-                    b.Property<int>("PoId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("PoId"));
-
-                    b.Property<bool>("ApprovalRequired")
-                        .HasColumnType("boolean");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int?>("RequisitionId")
-                        .HasColumnType("integer");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("VendorId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("PoId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("RequisitionId");
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("VendorId");
-
-                    b.ToTable("purchase_orders", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturn", b =>
-                {
-                    b.Property<int>("ReturnId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReturnId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int>("ReasonCodeId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("VendorId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ReturnId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("ReasonCodeId");
-
-                    b.HasIndex("VendorId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("purchase_returns", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturnLine", b =>
-                {
-                    b.Property<int>("ReturnLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReturnLineId"));
-
-                    b.Property<int?>("GrnLineId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("ReturnId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ReturnLineId");
-
-                    b.HasIndex("GrnLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("ReturnId");
-
-                    b.ToTable("purchase_return_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ReasonCode", b =>
-                {
-                    b.Property<int>("ReasonCodeId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReasonCodeId"));
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("Context")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.HasKey("ReasonCodeId");
-
-                    b.HasIndex("Context", "Code")
-                        .IsUnique();
-
-                    b.ToTable("reason_codes", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Requisition", b =>
-                {
-                    b.Property<int>("RequisitionId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RequisitionId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int>("RequestedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("RequisitionId");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("RequestedBy");
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("requisitions", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RequisitionLine", b =>
-                {
-                    b.Property<int>("ReqLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ReqLineId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<DateOnly?>("RequiredBy")
-                        .HasColumnType("date");
-
-                    b.Property<int>("RequisitionId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ReqLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("RequisitionId");
-
-                    b.ToTable("requisition_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Rfq", b =>
-                {
-                    b.Property<int>("RfqId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RfqId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int>("RequisitionId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("RfqId");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("RequisitionId");
-
-                    b.ToTable("rfqs", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RfqLine", b =>
-                {
-                    b.Property<int>("RfqLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RfqLineId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("RfqId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("RfqLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("RfqId");
-
-                    b.ToTable("rfq_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Role", b =>
-                {
-                    b.Property<int>("RoleId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RoleId"));
-
-                    b.Property<Guid>("AuthRoleId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("auth_role_id");
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<bool>("IsSystemRole")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("boolean")
-                        .HasDefaultValue(false);
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("RoleId");
-
-                    b.HasIndex("AuthRoleId")
-                        .IsUnique();
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.ToTable("roles", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RolePermission", b =>
-                {
-                    b.Property<int>("RoleId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("PermissionId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("RoleId", "PermissionId");
-
-                    b.HasIndex("PermissionId");
-
-                    b.ToTable("role_permissions", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RunEdge", b =>
-                {
-                    b.Property<int>("RunEdgeId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RunEdgeId"));
-
-                    b.Property<int>("ChildRunStageId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ParentRunStageId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("RunId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("RunEdgeId");
-
-                    b.HasIndex("ChildRunStageId");
-
-                    b.HasIndex("RunId");
-
-                    b.HasIndex("ParentRunStageId", "ChildRunStageId")
-                        .IsUnique();
-
-                    b.ToTable("run_edges", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RunStage", b =>
-                {
-                    b.Property<int>("RunStageId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RunStageId"));
-
-                    b.Property<DateTime?>("ActualEndAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<DateTime?>("ActualStartAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("EstimatedMinutes")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("FieldDefs")
-                        .IsRequired()
-                        .HasColumnType("jsonb");
-
-                    b.Property<string>("FieldValues")
-                        .HasColumnType("jsonb");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(150)
-                        .HasColumnType("character varying(150)");
-
-                    b.Property<decimal>("PosX")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("PosY")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<string>("RoleLabel")
-                        .HasMaxLength(60)
-                        .HasColumnType("character varying(60)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<int>("RunId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int?>("TemplateStageId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("RunStageId");
-
-                    b.HasIndex("TemplateStageId");
-
-                    b.HasIndex("RunId", "Status");
-
-                    b.ToTable("run_stages", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RunStageEvent", b =>
-                {
-                    b.Property<int>("EventId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("EventId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("EventType")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("Note")
-                        .HasMaxLength(500)
-                        .HasColumnType("character varying(500)");
-
-                    b.Property<string>("Payload")
-                        .HasColumnType("jsonb");
-
-                    b.Property<int>("RunId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("RunStageId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("UserId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("EventId");
-
-                    b.HasIndex("RunStageId");
-
-                    b.HasIndex("UserId");
-
-                    b.HasIndex("RunId", "EventId");
-
-                    b.ToTable("run_stage_events", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RunStageInput", b =>
-                {
-                    b.Property<int>("RunInputId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RunInputId"));
-
-                    b.Property<decimal>("ConsumedQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("ConsumedValue")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("DeliveredQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int?>("FromRunOutputId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("PlannedQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("ReturnedQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("ReturnedValue")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("RunStageId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Source")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("UomId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("RunInputId");
-
-                    b.HasIndex("FromRunOutputId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("RunStageId");
-
-                    b.HasIndex("UomId");
-
-                    b.ToTable("run_stage_inputs", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RunStageOutput", b =>
-                {
-                    b.Property<int>("RunOutputId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("RunOutputId"));
-
-                    b.Property<int?>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(150)
-                        .HasColumnType("character varying(150)");
-
-                    b.Property<decimal>("PlannedQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("ProducedQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("RunStageId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("ScrapReasonCodeId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("ScrappedQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("TransferredQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("UomId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("RunOutputId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("RunStageId");
-
-                    b.HasIndex("ScrapReasonCodeId");
-
-                    b.HasIndex("UomId");
-
-                    b.ToTable("run_stage_outputs", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.SalaryComponent", b =>
-                {
-                    b.Property<int>("SalaryComponentId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("SalaryComponentId"));
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("ComponentType")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<bool>("IsEpfEtfApplicable")
-                        .HasColumnType("boolean");
-
-                    b.Property<bool>("IsTaxable")
-                        .HasColumnType("boolean");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("SalaryComponentId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("hr_salary_components", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Serial", b =>
-                {
-                    b.Property<int>("SerialId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("SerialId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("SerialNo")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("character varying(100)");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("SerialId");
-
-                    b.HasIndex("ItemId", "SerialNo")
-                        .IsUnique();
-
-                    b.ToTable("serials", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StageEdge", b =>
-                {
-                    b.Property<int>("EdgeId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("EdgeId"));
-
-                    b.Property<int>("ChildStageId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ParentStageId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("TemplateId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("EdgeId");
-
-                    b.HasIndex("ChildStageId");
-
-                    b.HasIndex("TemplateId");
-
-                    b.HasIndex("ParentStageId", "ChildStageId")
-                        .IsUnique();
-
-                    b.ToTable("stage_edges", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StageInput", b =>
-                {
-                    b.Property<int>("InputId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("InputId"));
-
-                    b.Property<int?>("FromOutputId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("QtyPerBatch")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<string>("Source")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("StageId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("UomId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("InputId");
-
-                    b.HasIndex("FromOutputId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("StageId");
-
-                    b.HasIndex("UomId");
-
-                    b.ToTable("stage_inputs", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StageOutput", b =>
-                {
-                    b.Property<int>("OutputId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("OutputId"));
-
-                    b.Property<int?>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(150)
-                        .HasColumnType("character varying(150)");
-
-                    b.Property<decimal>("QtyPerBatch")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("StageId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("UomId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("OutputId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("StageId");
-
-                    b.HasIndex("UomId");
-
-                    b.ToTable("stage_outputs", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustment", b =>
-                {
-                    b.Property<int>("AdjustmentId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("AdjustmentId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<int>("ReasonCodeId")
-                        .HasColumnType("integer");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("AdjustmentId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("ReasonCodeId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("stock_adjustments", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustmentLine", b =>
-                {
-                    b.Property<int>("AdjLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("AdjLineId"));
-
-                    b.Property<int>("AdjustmentId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("QtyDelta")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int?>("SerialId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("AdjLineId");
-
-                    b.HasIndex("AdjustmentId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("BinId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("SerialId");
-
-                    b.ToTable("stock_adjustment_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCount", b =>
-                {
-                    b.Property<int>("CountId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CountId"));
-
-                    b.Property<string>("CountType")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("CountId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.ToTable("stock_counts", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCountLine", b =>
-                {
-                    b.Property<int>("CountLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CountLineId"));
-
-                    b.Property<int?>("BinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("CountId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal?>("CountedQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("SystemQty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal?>("Variance")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.HasKey("CountLineId");
-
-                    b.HasIndex("BinId");
-
-                    b.HasIndex("CountId");
-
-                    b.HasIndex("ItemId");
-
-                    b.ToTable("stock_count_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockLayer", b =>
-                {
-                    b.Property<int>("LayerId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("LayerId"));
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("GrnLineId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("QtyReceived")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("QtyRemaining")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<DateTime>("ReceiptDate")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int?>("SerialId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("UnitCost")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("LayerId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("GrnLineId");
-
-                    b.HasIndex("SerialId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.HasIndex("ItemId", "WarehouseId", "ReceiptDate", "LayerId");
-
-                    b.ToTable("stock_layers", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockLedger", b =>
-                {
-                    b.Property<int>("LedgerId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("LedgerId"));
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("BinId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Direction")
-                        .IsRequired()
-                        .HasMaxLength(5)
-                        .HasColumnType("character varying(5)");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("QtyBase")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("RunningBalance")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int?>("SerialId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("SourceDocId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("SourceDocType")
-                        .IsRequired()
-                        .HasMaxLength(10)
-                        .HasColumnType("character varying(10)");
-
-                    b.Property<decimal>("UnitCost")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.Property<int>("UserId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Value")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int>("WarehouseId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("LedgerId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("BinId");
-
-                    b.HasIndex("SerialId");
-
-                    b.HasIndex("UserId");
-
-                    b.HasIndex("WarehouseId");
-
-                    b.HasIndex("SourceDocType", "SourceDocId");
-
-                    b.HasIndex("ItemId", "WarehouseId", "CreatedAt");
-
-                    b.HasIndex("ItemId", "WarehouseId", "LedgerId");
-
-                    b.ToTable("stock_ledger", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransfer", b =>
-                {
-                    b.Property<int>("TransferId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TransferId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("CreatedBy")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("DestWarehouseId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("DocNo")
-                        .IsRequired()
-                        .HasMaxLength(30)
-                        .HasColumnType("character varying(30)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<int>("SrcWarehouseId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.HasKey("TransferId");
-
-                    b.HasIndex("CreatedBy");
-
-                    b.HasIndex("DestWarehouseId");
-
-                    b.HasIndex("DocNo")
-                        .IsUnique();
-
-                    b.HasIndex("SrcWarehouseId");
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("stock_transfers", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransferLine", b =>
-                {
-                    b.Property<int>("TransferLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TransferLineId"));
-
-                    b.Property<int?>("BatchId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("DestBinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("Qty")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("QtyReceived")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<int?>("SerialId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("SrcBinId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("TransferId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal?>("UnitCost")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.HasKey("TransferLineId");
-
-                    b.HasIndex("BatchId");
-
-                    b.HasIndex("DestBinId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("SerialId");
-
-                    b.HasIndex("SrcBinId");
-
-                    b.HasIndex("TransferId");
-
-                    b.ToTable("stock_transfer_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.SubCategory", b =>
-                {
-                    b.Property<int>("SubCategoryId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("SubCategoryId"));
-
-                    b.Property<int>("CategoryId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("SubCategoryId");
-
-                    b.HasIndex("Status");
-
-                    b.HasIndex("CategoryId", "Name")
-                        .IsUnique();
-
-                    b.ToTable("subcategories", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.SubNavItem", b =>
-                {
-                    b.Property<int>("SubNavItemId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("SubNavItemId"));
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Href")
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<string>("Icon")
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Label")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("character varying(100)");
-
-                    b.Property<int>("NavItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("SortOrder")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.HasKey("SubNavItemId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.HasIndex("NavItemId");
-
-                    b.ToTable("sub_nav_items", (string)null);
-
-                    b.HasData(
-                        new
-                        {
-                            SubNavItemId = 1,
-                            Code = "products.item",
-                            Href = "/dashboard/products",
-                            Label = "Item",
-                            NavItemId = 2,
-                            SortOrder = 1,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            SubNavItemId = 2,
-                            Code = "products.category",
-                            Href = "/dashboard/products/categories",
-                            Label = "Category",
-                            NavItemId = 2,
-                            SortOrder = 2,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            SubNavItemId = 3,
-                            Code = "products.brand",
-                            Href = "/dashboard/products/brands",
-                            Label = "Brand",
-                            NavItemId = 2,
-                            SortOrder = 3,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            SubNavItemId = 4,
-                            Code = "products.item-type",
-                            Href = "/dashboard/products/item-types",
-                            Label = "Item Type",
-                            NavItemId = 2,
-                            SortOrder = 4,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            SubNavItemId = 5,
-                            Code = "products.uom",
-                            Href = "/dashboard/products/uoms",
-                            Label = "UOM",
-                            NavItemId = 2,
-                            SortOrder = 5,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            SubNavItemId = 6,
-                            Code = "products.configuration",
-                            Href = "/dashboard/products/settings",
-                            Label = "Configuration",
-                            NavItemId = 2,
-                            SortOrder = 6,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            SubNavItemId = 7,
-                            Code = "settings.roles",
-                            Href = "/dashboard/settings/roles",
-                            Label = "Roles",
-                            NavItemId = 9,
-                            SortOrder = 1,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            SubNavItemId = 8,
-                            Code = "settings.users",
-                            Href = "/dashboard/settings/users",
-                            Label = "Users",
-                            NavItemId = 9,
-                            SortOrder = 2,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            SubNavItemId = 9,
-                            Code = "procurement.requisitions",
-                            Href = "/dashboard/procurement/requisitions",
-                            Label = "Requisitions",
-                            NavItemId = 4,
-                            SortOrder = 1,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            SubNavItemId = 10,
-                            Code = "procurement.rfqs",
-                            Href = "/dashboard/procurement/rfqs",
-                            Label = "RFQs",
-                            NavItemId = 4,
-                            SortOrder = 2,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            SubNavItemId = 11,
-                            Code = "procurement.purchase-orders",
-                            Href = "/dashboard/procurement/purchase-orders",
-                            Label = "Purchase Orders",
-                            NavItemId = 4,
-                            SortOrder = 3,
-                            Status = "Active"
-                        },
-                        new
-                        {
-                            SubNavItemId = 12,
-                            Code = "procurement.purchase-returns",
-                            Href = "/dashboard/procurement/purchase-returns",
-                            Label = "Purchase Returns",
-                            NavItemId = 4,
-                            SortOrder = 4,
-                            Status = "Active"
-                        });
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.TaxSlab", b =>
-                {
-                    b.Property<int>("TaxSlabId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TaxSlabId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<DateTime>("EffectiveFrom")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<DateTime?>("EffectiveTo")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<decimal>("LowerBound")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("numeric(18,2)");
-
-                    b.Property<decimal>("Rate")
-                        .HasPrecision(6, 4)
-                        .HasColumnType("numeric(6,4)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<decimal?>("UpperBound")
-                        .HasPrecision(18, 2)
-                        .HasColumnType("numeric(18,2)");
-
-                    b.HasKey("TaxSlabId");
-
-                    b.HasIndex("EffectiveFrom");
-
-                    b.ToTable("hr_tax_slabs", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.TemplateStage", b =>
-                {
-                    b.Property<int>("StageId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("StageId"));
-
-                    b.Property<int>("EstimatedMinutes")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("FieldDefs")
-                        .IsRequired()
-                        .HasColumnType("jsonb");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(150)
-                        .HasColumnType("character varying(150)");
-
-                    b.Property<decimal>("PosX")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<decimal>("PosY")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.Property<string>("RoleLabel")
-                        .HasMaxLength(60)
-                        .HasColumnType("character varying(60)");
-
-                    b.Property<int>("TemplateId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("StageId");
-
-                    b.HasIndex("TemplateId");
-
-                    b.ToTable("template_stages", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Uom", b =>
-                {
-                    b.Property<int>("UomId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("UomId"));
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.HasKey("UomId");
-
-                    b.HasIndex("Name")
-                        .IsUnique();
-
-                    b.ToTable("uoms", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.UomConversion", b =>
-                {
-                    b.Property<int>("ConversionId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ConversionId"));
-
-                    b.Property<decimal>("Factor")
-                        .HasPrecision(18, 6)
-                        .HasColumnType("numeric(18,6)");
-
-                    b.Property<int>("FromUomId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ToUomId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("ConversionId");
-
-                    b.HasIndex("FromUomId");
-
-                    b.HasIndex("ToUomId");
-
-                    b.HasIndex("ItemId", "FromUomId", "ToUomId")
-                        .IsUnique();
-
-                    b.ToTable("uom_conversions", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.User", b =>
-                {
-                    b.Property<int>("UserId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("UserId"));
-
-                    b.Property<Guid?>("AuthUserId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("auth_user_id");
-
-                    b.Property<string>("DisplayName")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<string>("Email")
-                        .HasMaxLength(320)
-                        .HasColumnType("character varying(320)");
-
-                    b.Property<int?>("RoleId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<string>("Username")
-                        .IsRequired()
-                        .HasMaxLength(100)
-                        .HasColumnType("character varying(100)");
-
-                    b.HasKey("UserId");
-
-                    b.HasIndex("AuthUserId")
-                        .IsUnique();
-
-                    b.HasIndex("Email")
-                        .IsUnique();
-
-                    b.HasIndex("RoleId");
-
-                    b.HasIndex("Username")
-                        .IsUnique();
-
-                    b.ToTable("users", (string)null);
-
-                    b.HasData(
-                        new
-                        {
-                            UserId = 1,
-                            DisplayName = "System",
-                            Status = "Active",
-                            Username = "system"
-                        });
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Vendor", b =>
-                {
-                    b.Property<int>("VendorId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("VendorId"));
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("Currency")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(3)
-                        .HasColumnType("character varying(3)")
-                        .HasDefaultValue("LKR");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<string>("TaxReg")
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Terms")
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.HasKey("VendorId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("vendors", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotation", b =>
-                {
-                    b.Property<int>("QuotationId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("QuotationId"));
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("RfqId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("VendorId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("QuotationId");
-
-                    b.HasIndex("VendorId");
-
-                    b.HasIndex("RfqId", "VendorId")
-                        .IsUnique();
-
-                    b.ToTable("vendor_quotations", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotationLine", b =>
-                {
-                    b.Property<int>("QuotationLineId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("QuotationLineId"));
-
-                    b.Property<int>("ItemId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("LeadDays")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("QuotationId")
-                        .HasColumnType("integer");
-
-                    b.Property<decimal>("UnitPrice")
-                        .HasPrecision(18, 4)
-                        .HasColumnType("numeric(18,4)");
-
-                    b.HasKey("QuotationLineId");
-
-                    b.HasIndex("ItemId");
-
-                    b.HasIndex("QuotationId");
-
-                    b.ToTable("vendor_quotation_lines", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Warehouse", b =>
-                {
-                    b.Property<int>("WarehouseId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("WarehouseId"));
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.HasKey("WarehouseId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.ToTable("warehouses", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.WorkShift", b =>
-                {
-                    b.Property<int>("WorkShiftId")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("WorkShiftId"));
-
-                    b.Property<int>("BreakMinutes")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Code")
-                        .IsRequired()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)");
-
-                    b.Property<DateTime>("CreatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<TimeSpan>("EndTime")
-                        .HasColumnType("interval");
-
-                    b.Property<int>("GraceMinutes")
-                        .HasColumnType("integer");
-
-                    b.Property<bool>("IsOvernight")
-                        .HasColumnType("boolean");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("character varying(200)");
-
-                    b.Property<decimal>("OtMultiplier")
-                        .HasPrecision(6, 2)
-                        .HasColumnType("numeric(6,2)");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("xid")
-                        .HasColumnName("xmin");
-
-                    b.Property<int>("StandardWorkingMinutes")
-                        .HasColumnType("integer");
-
-                    b.Property<TimeSpan>("StartTime")
-                        .HasColumnType("interval");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .ValueGeneratedOnAdd()
-                        .HasMaxLength(20)
-                        .HasColumnType("character varying(20)")
-                        .HasDefaultValue("Active");
-
-                    b.Property<DateTime?>("UpdatedAt")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("WorkingDaysMask")
-                        .HasColumnType("integer");
-
-                    b.HasKey("WorkShiftId");
-
-                    b.HasIndex("Code")
-                        .IsUnique();
-
-                    b.HasIndex("Status");
-
-                    b.ToTable("hr_work_shifts", (string)null);
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.AttendanceRecord", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.AttendanceUploadBatch", "AttendanceUploadBatch")
-                        .WithMany()
-                        .HasForeignKey("AttendanceUploadBatchId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("ERPCore.Domain.Entities.Employee", "Employee")
-                        .WithMany()
-                        .HasForeignKey("EmployeeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.WorkShift", "WorkShift")
-                        .WithMany()
-                        .HasForeignKey("WorkShiftId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("AttendanceUploadBatch");
-
-                    b.Navigation("Employee");
-
-                    b.Navigation("WorkShift");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.AuditLog", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Batch", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Bin", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany("Bins")
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Department", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Branch", "Branch")
-                        .WithMany()
-                        .HasForeignKey("BranchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Employee", "HeadEmployee")
-                        .WithMany()
-                        .HasForeignKey("HeadEmployeeId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Department", "ParentDepartment")
-                        .WithMany()
-                        .HasForeignKey("ParentDepartmentId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("Branch");
-
-                    b.Navigation("HeadEmployee");
-
-                    b.Navigation("ParentDepartment");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Employee", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Branch", "Branch")
-                        .WithMany()
-                        .HasForeignKey("BranchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Department", "Department")
-                        .WithMany()
-                        .HasForeignKey("DepartmentId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Designation", "Designation")
-                        .WithMany()
-                        .HasForeignKey("DesignationId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.EmploymentType", "EmploymentType")
-                        .WithMany()
-                        .HasForeignKey("EmploymentTypeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Employee", "ReportingManager")
-                        .WithMany()
-                        .HasForeignKey("ReportingManagerId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.User", "User")
-                        .WithOne()
-                        .HasForeignKey("ERPCore.Domain.Entities.Employee", "UserId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.WorkShift", "WorkShift")
-                        .WithMany()
-                        .HasForeignKey("WorkShiftId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Branch");
-
-                    b.Navigation("Department");
-
-                    b.Navigation("Designation");
-
-                    b.Navigation("EmploymentType");
-
-                    b.Navigation("ReportingManager");
-
-                    b.Navigation("User");
-
-                    b.Navigation("WorkShift");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.EmployeeBankDetail", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Employee", "Employee")
-                        .WithMany()
-                        .HasForeignKey("EmployeeId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Employee");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.EmployeeDocument", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Employee", "Employee")
-                        .WithMany()
-                        .HasForeignKey("EmployeeId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.HrDocumentType", "HrDocumentType")
-                        .WithMany()
-                        .HasForeignKey("HrDocumentTypeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Employee");
-
-                    b.Navigation("HrDocumentType");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.EmployeeLoan", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Employee", "Employee")
-                        .WithMany()
-                        .HasForeignKey("EmployeeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Employee");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.EmployeeSalaryStructure", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Employee", "Employee")
-                        .WithMany()
-                        .HasForeignKey("EmployeeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Employee");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.EmployeeSalaryStructureLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.EmployeeSalaryStructure", "EmployeeSalaryStructure")
-                        .WithMany("Lines")
-                        .HasForeignKey("EmployeeSalaryStructureId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.SalaryComponent", "SalaryComponent")
-                        .WithMany()
-                        .HasForeignKey("SalaryComponentId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("EmployeeSalaryStructure");
-
-                    b.Navigation("SalaryComponent");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Grn", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.PurchaseOrder", "PurchaseOrder")
-                        .WithMany()
-                        .HasForeignKey("PoId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "Vendor")
-                        .WithMany()
-                        .HasForeignKey("VendorId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("PurchaseOrder");
-
-                    b.Navigation("Vendor");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.GrnLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Batch", "Batch")
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", "Bin")
-                        .WithMany()
-                        .HasForeignKey("BinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Grn", "Grn")
-                        .WithMany("Lines")
-                        .HasForeignKey("GrnId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.PoLine", "PoLine")
-                        .WithMany()
-                        .HasForeignKey("PoLineId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
-                        .WithMany()
-                        .HasForeignKey("UomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Batch");
-
-                    b.Navigation("Bin");
-
-                    b.Navigation("Grn");
-
-                    b.Navigation("Item");
-
-                    b.Navigation("PoLine");
-
-                    b.Navigation("Uom");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Item", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "BaseUom")
-                        .WithMany()
-                        .HasForeignKey("BaseUomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Brand", "Brand")
-                        .WithMany()
-                        .HasForeignKey("BrandId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Category", "Category")
-                        .WithMany()
-                        .HasForeignKey("CategoryId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "DefaultVendor")
-                        .WithMany()
-                        .HasForeignKey("DefaultVendorId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.SubCategory", "SubCategory")
-                        .WithMany()
-                        .HasForeignKey("SubCategoryId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("BaseUom");
-
-                    b.Navigation("Brand");
-
-                    b.Navigation("Category");
-
-                    b.Navigation("DefaultVendor");
-
-                    b.Navigation("SubCategory");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ItemReorder", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany("ReorderSettings")
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.LeaveBalance", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Employee", "Employee")
-                        .WithMany()
-                        .HasForeignKey("EmployeeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.LeaveType", "LeaveType")
-                        .WithMany()
-                        .HasForeignKey("LeaveTypeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Employee");
-
-                    b.Navigation("LeaveType");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.LeaveRequest", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Employee", "Employee")
-                        .WithMany()
-                        .HasForeignKey("EmployeeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.LeaveType", "LeaveType")
-                        .WithMany()
-                        .HasForeignKey("LeaveTypeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Employee");
-
-                    b.Navigation("LeaveType");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.LoanInstallment", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.EmployeeLoan", "EmployeeLoan")
-                        .WithMany("Installments")
-                        .HasForeignKey("EmployeeLoanId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.PayrollRun", "PayrollRun")
-                        .WithMany()
-                        .HasForeignKey("PayrollRunId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("EmployeeLoan");
-
-                    b.Navigation("PayrollRun");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PayrollLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Employee", "Employee")
-                        .WithMany()
-                        .HasForeignKey("EmployeeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.PayrollRun", "PayrollRun")
-                        .WithMany("Lines")
-                        .HasForeignKey("PayrollRunId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Employee");
-
-                    b.Navigation("PayrollRun");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PayrollLineComponent", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.PayrollLine", "PayrollLine")
-                        .WithMany("Components")
-                        .HasForeignKey("PayrollLineId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.SalaryComponent", "SalaryComponent")
-                        .WithMany()
-                        .HasForeignKey("SalaryComponentId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("PayrollLine");
-
-                    b.Navigation("SalaryComponent");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PayrollRun", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Branch", "Branch")
-                        .WithMany()
-                        .HasForeignKey("BranchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("Branch");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Payslip", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.PayrollLine", "PayrollLine")
-                        .WithOne()
-                        .HasForeignKey("ERPCore.Domain.Entities.Payslip", "PayrollLineId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("PayrollLine");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Permission", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.NavItem", "NavItem")
-                        .WithMany()
-                        .HasForeignKey("NavItemId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("ERPCore.Domain.Entities.SubNavItem", "SubNavItem")
-                        .WithMany()
-                        .HasForeignKey("SubNavItemId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.Navigation("NavItem");
-
-                    b.Navigation("SubNavItem");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PoLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.PurchaseOrder", "PurchaseOrder")
-                        .WithMany("Lines")
-                        .HasForeignKey("PoId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
-                        .WithMany()
-                        .HasForeignKey("UomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("PurchaseOrder");
-
-                    b.Navigation("Uom");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ProductConfig", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "UpdatedByUser")
-                        .WithMany()
-                        .HasForeignKey("UpdatedBy")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("UpdatedByUser");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ProductionRun", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.ReasonCode", "CancelReason")
-                        .WithMany()
-                        .HasForeignKey("CancelReasonCodeId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", "OutputBin")
-                        .WithMany()
-                        .HasForeignKey("OutputBinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.ProductionTemplate", "Template")
-                        .WithMany("Runs")
-                        .HasForeignKey("TemplateId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("CancelReason");
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("OutputBin");
-
-                    b.Navigation("Template");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ProductionTemplate", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseOrder", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Requisition", "Requisition")
-                        .WithMany()
-                        .HasForeignKey("RequisitionId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "Vendor")
-                        .WithMany()
-                        .HasForeignKey("VendorId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("Requisition");
-
-                    b.Navigation("Vendor");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturn", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.ReasonCode", "ReasonCode")
-                        .WithMany()
-                        .HasForeignKey("ReasonCodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "Vendor")
-                        .WithMany()
-                        .HasForeignKey("VendorId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("ReasonCode");
-
-                    b.Navigation("Vendor");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturnLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.GrnLine", "GrnLine")
-                        .WithMany()
-                        .HasForeignKey("GrnLineId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.PurchaseReturn", "Return")
-                        .WithMany("Lines")
-                        .HasForeignKey("ReturnId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("GrnLine");
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Return");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Requisition", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Requester")
-                        .WithMany()
-                        .HasForeignKey("RequestedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Requester");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RequisitionLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Requisition", "Requisition")
-                        .WithMany("Lines")
-                        .HasForeignKey("RequisitionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Requisition");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Rfq", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Requisition", "Requisition")
-                        .WithMany()
-                        .HasForeignKey("RequisitionId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Requisition");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RfqLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Rfq", "Rfq")
-                        .WithMany("Lines")
-                        .HasForeignKey("RfqId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Rfq");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RolePermission", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Permission", "Permission")
-                        .WithMany()
-                        .HasForeignKey("PermissionId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Role", "Role")
-                        .WithMany()
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Permission");
-
-                    b.Navigation("Role");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RunEdge", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.RunStage", "ChildRunStage")
-                        .WithMany()
-                        .HasForeignKey("ChildRunStageId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.RunStage", "ParentRunStage")
-                        .WithMany()
-                        .HasForeignKey("ParentRunStageId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.ProductionRun", "Run")
-                        .WithMany("Edges")
-                        .HasForeignKey("RunId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("ChildRunStage");
-
-                    b.Navigation("ParentRunStage");
-
-                    b.Navigation("Run");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RunStage", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.ProductionRun", "Run")
-                        .WithMany("Stages")
-                        .HasForeignKey("RunId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.TemplateStage", "TemplateStage")
-                        .WithMany()
-                        .HasForeignKey("TemplateStageId")
-                        .OnDelete(DeleteBehavior.SetNull);
-
-                    b.Navigation("Run");
-
-                    b.Navigation("TemplateStage");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RunStageEvent", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.ProductionRun", "Run")
-                        .WithMany("Events")
-                        .HasForeignKey("RunId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.RunStage", "RunStage")
-                        .WithMany("Events")
-                        .HasForeignKey("RunStageId")
-                        .OnDelete(DeleteBehavior.SetNull);
-
-                    b.HasOne("ERPCore.Domain.Entities.User", "User")
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Run");
-
-                    b.Navigation("RunStage");
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RunStageInput", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.RunStageOutput", "FromRunOutput")
-                        .WithMany()
-                        .HasForeignKey("FromRunOutputId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.RunStage", "RunStage")
-                        .WithMany("Inputs")
-                        .HasForeignKey("RunStageId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
-                        .WithMany()
-                        .HasForeignKey("UomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("FromRunOutput");
-
-                    b.Navigation("Item");
-
-                    b.Navigation("RunStage");
-
-                    b.Navigation("Uom");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RunStageOutput", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.RunStage", "RunStage")
-                        .WithMany("Outputs")
-                        .HasForeignKey("RunStageId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.ReasonCode", "ScrapReason")
-                        .WithMany()
-                        .HasForeignKey("ScrapReasonCodeId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
-                        .WithMany()
-                        .HasForeignKey("UomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("RunStage");
-
-                    b.Navigation("ScrapReason");
-
-                    b.Navigation("Uom");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Serial", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StageEdge", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.TemplateStage", "ChildStage")
-                        .WithMany()
-                        .HasForeignKey("ChildStageId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.TemplateStage", "ParentStage")
-                        .WithMany()
-                        .HasForeignKey("ParentStageId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.ProductionTemplate", "Template")
-                        .WithMany("Edges")
-                        .HasForeignKey("TemplateId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("ChildStage");
-
-                    b.Navigation("ParentStage");
-
-                    b.Navigation("Template");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StageInput", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.StageOutput", "FromOutput")
-                        .WithMany()
-                        .HasForeignKey("FromOutputId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.TemplateStage", "Stage")
-                        .WithMany("Inputs")
-                        .HasForeignKey("StageId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
-                        .WithMany()
-                        .HasForeignKey("UomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("FromOutput");
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Stage");
-
-                    b.Navigation("Uom");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StageOutput", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.TemplateStage", "Stage")
-                        .WithMany("Outputs")
-                        .HasForeignKey("StageId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "Uom")
-                        .WithMany()
-                        .HasForeignKey("UomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Stage");
-
-                    b.Navigation("Uom");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustment", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.ReasonCode", "ReasonCode")
-                        .WithMany()
-                        .HasForeignKey("ReasonCodeId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("ReasonCode");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustmentLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.StockAdjustment", "Adjustment")
-                        .WithMany("Lines")
-                        .HasForeignKey("AdjustmentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Batch", null)
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("BinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Serial", null)
-                        .WithMany()
-                        .HasForeignKey("SerialId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("Adjustment");
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCount", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCountLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("BinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.StockCount", "Count")
-                        .WithMany("Lines")
-                        .HasForeignKey("CountId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Count");
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockLayer", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Batch", "Batch")
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.GrnLine", "GrnLine")
-                        .WithMany()
-                        .HasForeignKey("GrnLineId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Serial", "Serial")
-                        .WithMany()
-                        .HasForeignKey("SerialId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Batch");
-
-                    b.Navigation("GrnLine");
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Serial");
-
-                    b.Navigation("Warehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockLedger", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Batch", null)
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("BinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", null)
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Serial", null)
-                        .WithMany()
-                        .HasForeignKey("SerialId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.User", null)
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", null)
-                        .WithMany()
-                        .HasForeignKey("WarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransfer", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
-                        .WithMany()
-                        .HasForeignKey("CreatedBy")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "DestWarehouse")
-                        .WithMany()
-                        .HasForeignKey("DestWarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Warehouse", "SrcWarehouse")
-                        .WithMany()
-                        .HasForeignKey("SrcWarehouseId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Creator");
-
-                    b.Navigation("DestWarehouse");
-
-                    b.Navigation("SrcWarehouse");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransferLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Batch", null)
-                        .WithMany()
-                        .HasForeignKey("BatchId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("DestBinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Serial", null)
-                        .WithMany()
-                        .HasForeignKey("SerialId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.Bin", null)
-                        .WithMany()
-                        .HasForeignKey("SrcBinId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.HasOne("ERPCore.Domain.Entities.StockTransfer", "Transfer")
-                        .WithMany("Lines")
-                        .HasForeignKey("TransferId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Transfer");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.SubCategory", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Category", "Category")
-                        .WithMany("SubCategories")
-                        .HasForeignKey("CategoryId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Category");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.SubNavItem", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.NavItem", "NavItem")
-                        .WithMany("Children")
-                        .HasForeignKey("NavItemId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("NavItem");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.TemplateStage", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.ProductionTemplate", "Template")
-                        .WithMany("Stages")
-                        .HasForeignKey("TemplateId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Template");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.UomConversion", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "FromUom")
-                        .WithMany()
-                        .HasForeignKey("FromUomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany("UomConversions")
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Uom", "ToUom")
-                        .WithMany()
-                        .HasForeignKey("ToUomId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("FromUom");
-
-                    b.Navigation("Item");
-
-                    b.Navigation("ToUom");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.User", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Role", "Role")
-                        .WithMany()
-                        .HasForeignKey("RoleId")
-                        .OnDelete(DeleteBehavior.Restrict);
-
-                    b.Navigation("Role");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotation", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Rfq", "Rfq")
-                        .WithMany("Quotations")
-                        .HasForeignKey("RfqId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.Vendor", "Vendor")
-                        .WithMany()
-                        .HasForeignKey("VendorId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.Navigation("Rfq");
-
-                    b.Navigation("Vendor");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotationLine", b =>
-                {
-                    b.HasOne("ERPCore.Domain.Entities.Item", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Restrict)
-                        .IsRequired();
-
-                    b.HasOne("ERPCore.Domain.Entities.VendorQuotation", "Quotation")
-                        .WithMany("Lines")
-                        .HasForeignKey("QuotationId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-
-                    b.Navigation("Quotation");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Category", b =>
-                {
-                    b.Navigation("SubCategories");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.EmployeeLoan", b =>
-                {
-                    b.Navigation("Installments");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.EmployeeSalaryStructure", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Grn", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Item", b =>
-                {
-                    b.Navigation("ReorderSettings");
-
-                    b.Navigation("UomConversions");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.NavItem", b =>
-                {
-                    b.Navigation("Children");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PayrollLine", b =>
-                {
-                    b.Navigation("Components");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PayrollRun", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ProductionRun", b =>
-                {
-                    b.Navigation("Edges");
-
-                    b.Navigation("Events");
-
-                    b.Navigation("Stages");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.ProductionTemplate", b =>
-                {
-                    b.Navigation("Edges");
-
-                    b.Navigation("Runs");
-
-                    b.Navigation("Stages");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseOrder", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.PurchaseReturn", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Requisition", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Rfq", b =>
-                {
-                    b.Navigation("Lines");
-
-                    b.Navigation("Quotations");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.RunStage", b =>
-                {
-                    b.Navigation("Events");
-
-                    b.Navigation("Inputs");
-
-                    b.Navigation("Outputs");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustment", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockCount", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransfer", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.TemplateStage", b =>
-                {
-                    b.Navigation("Inputs");
-
-                    b.Navigation("Outputs");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.VendorQuotation", b =>
-                {
-                    b.Navigation("Lines");
-                });
-
-            modelBuilder.Entity("ERPCore.Domain.Entities.Warehouse", b =>
-                {
-                    b.Navigation("Bins");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/Backend/ERPCore/Program.cs b/Backend/ERPCore/Program.cs
index 1a40914..cc51f3e 100644
--- a/Backend/ERPCore/Program.cs
+++ b/Backend/ERPCore/Program.cs
@@ -1,21 +1,24 @@
 using System.Text.Json.Serialization;
 using ERPCore.Infra.Auth;
 using ERPCore.Infra.Auth.AuthHex;
+using ERPCore.Infra.Gl;
 using ERPCore.Infra.Persistence;
 using ERPCore.Infra.Storage;
 using ERPCore.Infra.UoW;
 using ERPCore.Repositories;
 using ERPCore.Repositories.Interfaces;
 using ERPCore.Services;
+using ERPCore.Services.Interfaces;
 using ERPCore.Services.Auth;
 using ERPCore.Services.Hrm;
-using ERPCore.Services.Interfaces;
 using ERPCore.Services.Production;
 using ERPCore.Services.Stock;
 using ERPCore.System.Errors;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.OpenApi;
+using Npgsql;
 using Serilog;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -31,7 +34,10 @@ builder.Services.AddControllers()
 
 // EF Core + PostgreSQL
 builder.Services.AddDbContext<ErpDbContext>(o =>
-    o.UseNpgsql(builder.Configuration.GetConnectionString("DefaultConnection")));
+{
+    o.UseNpgsql(builder.Configuration.GetConnectionString("DefaultConnection"));
+    o.ConfigureWarnings(w => w.Ignore(RelationalEventId.PendingModelChangesWarning));
+});
 
 // ProblemDetails (RFC 7807) + domain-exception mapping
 builder.Services.AddProblemDetails();
@@ -51,6 +57,15 @@ builder.Services.AddScoped<IAuthUserService, AuthUserService>();
 builder.Services.AddScoped<IAuthRecoveryService, AuthRecoveryService>();
 builder.Services.AddScoped<IAuthAltService, AuthAltService>();
 
+// General Ledger service proxy → external GL microservice (docs/12-GENERAL-LEDGER-INTEGRATION.md)
+builder.Services.AddHttpClient<IGeneralLedgerClient, GeneralLedgerClient>(c =>
+{
+    var baseUrl = builder.Configuration["GeneralLedgerService:BaseUrl"]
+        ?? throw new InvalidOperationException("GeneralLedgerService:BaseUrl is not configured.");
+    c.BaseAddress = new Uri(baseUrl);
+});
+builder.Services.AddScoped<IGeneralLedgerService, GeneralLedgerService>();
+
 // Current-user (audit actor). AuthHex has no sub/nameid → a claims transformation
 // JIT-provisions a local shadow user and injects the local `int` id as `nameid`.
 builder.Services.AddHttpContextAccessor();
@@ -62,11 +77,13 @@ builder.Services.AddScoped<IUnitOfWork, UnitOfWork>();
 builder.Services.AddScoped(typeof(IRepository<>), typeof(Repository<>));
 
 // Master-data services (docs/11 §2)
+builder.Services.AddScoped<ICustomerService, CustomerService>();
 builder.Services.AddScoped<IItemService, ItemService>();
 builder.Services.AddScoped<IUomService, UomService>();
 builder.Services.AddScoped<ICategoryService, CategoryService>();
 builder.Services.AddScoped<IBrandService, BrandService>();
 builder.Services.AddScoped<IItemTypeService, ItemTypeService>();
+//builder.Services.AddScoped<ICompanyProfileService, CompanyProfileService>();
 builder.Services.AddScoped<IProductConfigService, ProductConfigService>();
 builder.Services.AddScoped<IVendorService, VendorService>();
 builder.Services.AddScoped<IWarehouseService, WarehouseService>();
@@ -87,6 +104,18 @@ builder.Services.AddScoped<IFifoCostingService, FifoCostingService>();
 builder.Services.AddScoped<IStockService, StockService>();
 builder.Services.AddScoped<IGrnService, GrnService>();
 
+// Sales (Phase 1)
+builder.Services.AddScoped<ISalesPricingService, SalesPricingService>();
+builder.Services.AddScoped<ISalesDomainService, SalesDomainService>();
+builder.Services.AddScoped<ISalesPostingService, SalesPostingService>();
+builder.Services.AddScoped<ISalesDocumentWorkflowService, SalesDocumentWorkflowService>();
+builder.Services.AddScoped<ISalesMappingService, SalesMappingService>();
+builder.Services.AddScoped<ISalesInvoiceService, SalesInvoiceService>();
+builder.Services.AddScoped<ISalesSlipService, SalesSlipService>();
+builder.Services.AddScoped<IBundleSaleService, BundleSaleService>();
+builder.Services.AddScoped<ISalesPromotionSuggestionService, SalesPromotionSuggestionService>();
+builder.Services.AddScoped<ISalesReportService, SalesReportService>();
+
 // Stock transactions + reference data (docs/11 §5–6)
 builder.Services.AddScoped<IStockMutator, StockMutator>();
 builder.Services.AddScoped<IReasonCodeService, ReasonCodeService>();
@@ -161,7 +190,16 @@ var app = builder.Build();
 using (var scope = app.Services.CreateScope())
 {
     var db = scope.ServiceProvider.GetRequiredService<ErpDbContext>();
-    await DataSeeder.SeedAsync(db);
+   // await EnsureMigrationBaselineAsync(db);
+    await db.Database.MigrateAsync();
+    try
+    {
+        await DataSeeder.SeedAsync(db);
+    }
+    catch (Exception ex)
+    {
+        throw new InvalidOperationException("Database migration succeeded, but startup seeding failed.", ex);
+    }
 }
 
 app.UseSerilogRequestLogging();
@@ -178,3 +216,4 @@ app.UseAuthorization();
 app.MapControllers();
 app.MapHealthChecks("/health");
 app.Run();
+
diff --git a/Backend/ERPCore/Services/BundleSaleService.cs b/Backend/ERPCore/Services/BundleSaleService.cs
new file mode 100644
index 0000000..072958e
--- /dev/null
+++ b/Backend/ERPCore/Services/BundleSaleService.cs
@@ -0,0 +1,250 @@
+using ERPCore.Domain;
+using ERPCore.Domain.Entities;
+using ERPCore.Domain.Enums;
+using ERPCore.Dtos.Common;
+using ERPCore.Dtos.Sales;
+using ERPCore.Infra.Auth;
+using ERPCore.Infra.UoW;
+using ERPCore.Repositories.Interfaces;
+using ERPCore.Services.Interfaces;
+using ERPCore.Services.Stock;
+using ERPCore.System.Errors;
+using Microsoft.EntityFrameworkCore;
+
+namespace ERPCore.Services;
+
+public sealed class BundleSaleService : IBundleSaleService
+{
+    private readonly IRepository<BundleSaleTemplate> _templates;
+    private readonly IRepository<BundleSale> _bundles;
+    private readonly IRepository<Customer> _customers;
+    private readonly IRepository<Item> _items;
+    private readonly IRepository<Uom> _uoms;
+    private readonly IRepository<Warehouse> _warehouses;
+    private readonly IRepository<User> _users;
+    private readonly ISalesDomainService _sales;
+    private readonly ISalesPostingService _posting;
+    private readonly ICurrentUser _currentUser;
+    private readonly INumberSequenceService _numbers;
+    private readonly IUnitOfWork _uow;
+
+    public BundleSaleService(
+        IRepository<BundleSale> bundles,
+        IRepository<BundleSaleTemplate> templates,
+        IRepository<Customer> customers,
+        IRepository<Item> items,
+        IRepository<Uom> uoms,
+        IRepository<Warehouse> warehouses,
+        IRepository<User> users,
+        ISalesDomainService sales,
+        ISalesPostingService posting,
+        ICurrentUser currentUser,
+        INumberSequenceService numbers,
+        IUnitOfWork uow)
+    {
+        _templates = templates;
+        _bundles = bundles;
+        _customers = customers;
+        _items = items;
+        _uoms = uoms;
+        _warehouses = warehouses;
+        _users = users;
+        _sales = sales;
+        _posting = posting;
+        _currentUser = currentUser;
+        _numbers = numbers;
+        _uow = uow;
+    }
+
+    public async Task<PagedResponse<BundleSaleTemplateSummaryDto>> ListTemplatesAsync(PageQuery query, CancellationToken ct = default)
+    {
+        IQueryable<BundleSaleTemplate> q = _templates.Query().AsNoTracking().Include(x => x.Lines);
+        if (!string.IsNullOrWhiteSpace(query.Q))
+        {
+            var term = query.Q.Trim();
+            q = q.Where(x => EF.Functions.ILike(x.TemplateCode, $"%{term}%") || EF.Functions.ILike(x.TemplateName, $"%{term}%") || EF.Functions.ILike(x.Description ?? "", $"%{term}%"));
+        }
+        var total = await q.CountAsync(ct);
+        var rows = await q.OrderByDescending(x => x.BundleSaleTemplateId).Skip(query.Skip).Take(query.PageSize).ToListAsync(ct);
+        return PagedResponse<BundleSaleTemplateSummaryDto>.Create(rows.Select(x => new BundleSaleTemplateSummaryDto(
+            x.BundleSaleTemplateId, x.TemplateCode, x.TemplateName, x.Description, x.Status, x.Lines.Count, x.CreatedAt, x.UpdatedAt)).ToList(), query.Page, query.PageSize, total);
+    }
+
+    public async Task<BundleSaleTemplateDto?> GetTemplateAsync(int bundleSaleTemplateId, CancellationToken ct = default)
+    {
+        var template = await _templates.Query().AsNoTracking().Include(x => x.Lines).FirstOrDefaultAsync(x => x.BundleSaleTemplateId == bundleSaleTemplateId, ct);
+        return template is null ? null : new BundleSaleTemplateDto(
+            template.BundleSaleTemplateId,
+            template.TemplateCode,
+            template.TemplateName,
+            template.Description,
+            template.Status,
+            template.CreatedAt,
+            template.UpdatedAt,
+            template.Lines.OrderBy(x => x.SortOrder).Select(x => new BundleSaleTemplateLineDto(
+                x.BundleSaleTemplateLineId, x.ItemId, x.UomId, x.WarehouseId, x.Qty, x.UnitPrice, x.IncludeInBundle, x.SortOrder)).ToList());
+    }
+
+    public async Task<PagedResponse<BundleSaleSummaryDto>> ListAsync(PageQuery query, int? customerId, int? warehouseId, CancellationToken ct = default)
+    {
+        IQueryable<BundleSale> q = _bundles.Query().AsNoTracking().Include(x => x.Lines);
+        if (!string.IsNullOrWhiteSpace(query.Q))
+        {
+            var term = query.Q.Trim();
+            q = q.Where(x => EF.Functions.ILike(x.BundleNo, $"%{term}%") || EF.Functions.ILike(x.BundleName, $"%{term}%") || EF.Functions.ILike(x.BundleCode, $"%{term}%"));
+        }
+        if (customerId is not null) q = q.Where(x => x.CustomerId == customerId);
+        if (warehouseId is not null) q = q.Where(x => x.WarehouseId == warehouseId);
+        var total = await q.CountAsync(ct);
+        var rows = await q.OrderByDescending(x => x.BundleSaleId).Skip(query.Skip).Take(query.PageSize).ToListAsync(ct);
+        return PagedResponse<BundleSaleSummaryDto>.Create(rows.Select(MapSummary).ToList(), query.Page, query.PageSize, total);
+    }
+
+    public async Task<BundleSaleDto?> GetAsync(int bundleSaleId, CancellationToken ct = default)
+    {
+        var bundle = await _bundles.Query().AsNoTracking().Include(x => x.Lines).FirstOrDefaultAsync(x => x.BundleSaleId == bundleSaleId, ct);
+        return bundle is null ? null : Map(bundle);
+    }
+
+    public Task<BundleSalePostingCheckDto> CheckPostingAsync(int bundleSaleId, CancellationToken ct = default)
+        => _posting.CheckBundleAsync(bundleSaleId, ct);
+
+    public async Task<BundleSaleDto> CreateAsync(CreateBundleSaleRequest request, CancellationToken ct = default)
+    {
+        await _sales.ValidateSalesHeaderAsync(request.CustomerId, request.WarehouseId, request.CashierUserId, true, ct);
+        var template = await _templates.Query().AsNoTracking().Include(x => x.Lines)
+            .FirstAsync(x => x.BundleSaleTemplateId == request.BundleSaleTemplateId, ct);
+        var bundle = new BundleSale
+        {
+            BundleNo = await _numbers.NextAsync(DocumentTypes.BundleSale, ct),
+            BundleDate = DateTime.UtcNow,
+            CustomerId = request.CustomerId,
+            WarehouseId = request.WarehouseId,
+            CashierUserId = request.CashierUserId,
+            BundleSaleTemplateId = request.BundleSaleTemplateId,
+            BundleName = request.BundleName,
+            BundleCode = string.Empty,
+            Status = BundleSaleStatus.Draft,
+            CreatedAt = DateTime.UtcNow
+        };
+        bundle.CustomerSnapshotName = await _customers.Query().Where(x => x.CustomerId == request.CustomerId).Select(x => x.DisplayName ?? x.Name).FirstAsync(ct);
+        bundle.Lines = await BuildLinesAsync(template, request.WarehouseId, request.Lines, ct);
+        Recalculate(bundle, request.BundlePrice);
+        bundle.BundleCode = $"{bundle.BundleNo}-B";
+        await _bundles.AddAsync(bundle, ct);
+        bundle.ConcurrencyStamp = 1;
+        await _uow.SaveChangesAsync(ct);
+        return Map(bundle);
+    }
+
+    public async Task<BundleSaleDto> UpdateAsync(int bundleSaleId, UpdateBundleSaleRequest request, CancellationToken ct = default)
+    {
+        var bundle = await _bundles.Query().Include(x => x.Lines).FirstOrDefaultAsync(x => x.BundleSaleId == bundleSaleId, ct)
+            ?? throw new NotFoundException($"Bundle sale {bundleSaleId} was not found.");
+        if (bundle.Status != BundleSaleStatus.Draft)
+            throw new ConflictException($"Bundle sale {bundleSaleId} is {bundle.Status} and cannot be edited.");
+
+        await _sales.ValidateSalesHeaderAsync(request.CustomerId, request.WarehouseId, request.CashierUserId, true, ct);
+        var template = await _templates.Query().AsNoTracking().Include(x => x.Lines)
+            .FirstAsync(x => x.BundleSaleTemplateId == request.BundleSaleTemplateId, ct);
+        bundle.CustomerId = request.CustomerId;
+        bundle.WarehouseId = request.WarehouseId;
+        bundle.CashierUserId = request.CashierUserId;
+        bundle.BundleSaleTemplateId = request.BundleSaleTemplateId;
+        bundle.BundleName = request.BundleName;
+        bundle.CustomerSnapshotName = await _customers.Query().Where(x => x.CustomerId == request.CustomerId).Select(x => x.DisplayName ?? x.Name).FirstAsync(ct);
+        bundle.Lines.Clear();
+        foreach (var line in await BuildLinesAsync(template, request.WarehouseId, request.Lines, ct)) bundle.Lines.Add(line);
+        Recalculate(bundle, request.BundlePrice);
+        bundle.UpdatedAt = DateTime.UtcNow;
+        bundle.ConcurrencyStamp++;
+        await _uow.SaveChangesAsync(ct);
+        return Map(bundle);
+    }
+
+    public async Task<BundleSaleDto> PostAsync(int bundleSaleId, CancellationToken ct = default)
+        {
+            await _posting.PostBundleAsync(bundleSaleId, ct);
+            var bundle = await _bundles.Query().AsNoTracking().Include(x => x.Lines)
+                .FirstAsync(x => x.BundleSaleId == bundleSaleId, ct);
+            return Map(bundle);
+        }
+
+    public async Task<BundleSaleDto> CancelAsync(int bundleSaleId, CancellationToken ct = default)
+    {
+        var bundle = await _bundles.Query().Include(x => x.Lines).FirstOrDefaultAsync(x => x.BundleSaleId == bundleSaleId, ct)
+            ?? throw new NotFoundException($"Bundle sale {bundleSaleId} was not found.");
+        if (bundle.Status != BundleSaleStatus.Draft)
+            throw new ConflictException($"Bundle sale {bundleSaleId} is {bundle.Status} and cannot be cancelled.");
+        bundle.Status = BundleSaleStatus.Cancelled;
+        bundle.UpdatedAt = DateTime.UtcNow;
+        bundle.ConcurrencyStamp++;
+        await _uow.SaveChangesAsync(ct);
+        return Map(bundle);
+    }
+
+    private async Task<List<BundleSaleLine>> BuildLinesAsync(
+        BundleSaleTemplate template, int warehouseId, IReadOnlyList<CreateBundleSaleTemplateLineRequest> requestLines, CancellationToken ct)
+    {
+        var lines = new List<BundleSaleLine>();
+        var sourceLines = requestLines.Count > 0
+            ? requestLines.OrderBy(x => x.SortOrder).ToList()
+            : template.Lines.OrderBy(x => x.SortOrder).Select(x => new CreateBundleSaleTemplateLineRequest
+            {
+                ItemId = x.ItemId,
+                UomId = x.UomId,
+                WarehouseId = x.WarehouseId,
+                Qty = x.Qty,
+                UnitPrice = x.UnitPrice,
+                IncludeInBundle = x.IncludeInBundle,
+                SortOrder = x.SortOrder
+            }).ToList();
+
+        foreach (var r in sourceLines)
+        {
+            if (r.Qty <= 0)
+                throw new DomainException(ErrorCodes.Validation, "Bundle line quantity must be greater than zero.", 422);
+            if (r.WarehouseId != warehouseId)
+                throw new DomainException(ErrorCodes.Validation,
+                    $"Bundle line warehouse {r.WarehouseId} must match header warehouse {warehouseId}.", 422);
+            var item = await _items.Query().AsNoTracking().FirstAsync(x => x.ItemId == r.ItemId, ct);
+            await _sales.ValidateSalesLineAsync(warehouseId, r.ItemId, r.UomId, r.WarehouseId, r.Qty, 0m, null, ct);
+            var resolved = await _sales.ResolveLinePriceAsync(r.ItemId, r.WarehouseId, r.UnitPrice, true, ct);
+            var calc = _sales.ComputeLine(r.Qty, 0m, resolved.UnitPrice, SalesDiscountMode.Amount, 0m, 0m, 0m, 0m, false);
+            lines.Add(new BundleSaleLine
+            {
+                ItemId = r.ItemId,
+                Description = item.Name,
+                Qty = r.Qty,
+                UomId = r.UomId,
+                WarehouseId = r.WarehouseId,
+                UnitPrice = resolved.UnitPrice,
+                LineTotal = calc.LineTotal,
+                IncludeInBundle = r.IncludeInBundle,
+                IsComponent = true,
+                ParentLineId = null
+            });
+        }
+        return lines;
+    }
+
+    private static void Recalculate(BundleSale bundle, decimal bundlePrice)
+    {
+        bundle.ComponentSubtotal = bundle.Lines.Where(x => x.IncludeInBundle).Sum(x => x.LineTotal);
+        bundle.BundlePrice = bundlePrice;
+        bundle.MarginAmount = bundle.BundlePrice - bundle.ComponentSubtotal;
+        bundle.DiscountTotal = Math.Max(0m, bundle.ComponentSubtotal - bundle.BundlePrice);
+        bundle.TaxTotal = 0m;
+        bundle.GrandTotal = bundle.BundlePrice + bundle.TaxTotal;
+    }
+
+    private static BundleSaleSummaryDto MapSummary(BundleSale x) => new(
+        x.BundleSaleId, x.BundleNo, x.BundleDate, x.CustomerId, x.CustomerSnapshotName, x.WarehouseId, x.BundleName, x.BundleCode, x.Status, x.ComponentSubtotal, x.BundlePrice, x.GrandTotal, x.CreatedAt);
+
+    private static BundleSaleDto Map(BundleSale x) => new(
+        x.BundleSaleId, x.BundleNo, x.BundleDate, x.CustomerId, x.CustomerSnapshotName, x.WarehouseId, x.CashierUserId, x.BundleSaleTemplateId,
+        x.BundleName, x.BundleCode, x.Status, x.ComponentSubtotal, x.BundlePrice, x.MarginAmount, x.DiscountTotal, x.TaxTotal, x.GrandTotal,
+        x.CreatedAt, x.UpdatedAt,
+        x.Lines.Select(l => new BundleSaleLineDto(l.BundleSaleLineId, l.ItemId, l.Description, l.Qty, l.UomId, l.WarehouseId, l.UnitPrice, l.LineTotal, l.IncludeInBundle, l.IsComponent, l.ParentLineId)).ToList());
+
+}
diff --git a/Backend/ERPCore/Services/CustomerService.cs b/Backend/ERPCore/Services/CustomerService.cs
new file mode 100644
index 0000000..0f7c64e
--- /dev/null
+++ b/Backend/ERPCore/Services/CustomerService.cs
@@ -0,0 +1,168 @@
+using ERPCore.Common.Http;
+using ERPCore.Domain.Entities;
+using ERPCore.Domain.Enums;
+using ERPCore.Dtos.Common;
+using ERPCore.Dtos.Customers;
+using ERPCore.Infra.UoW;
+using ERPCore.Repositories.Interfaces;
+using ERPCore.Services.Interfaces;
+using ERPCore.System.Errors;
+using Microsoft.EntityFrameworkCore;
+
+namespace ERPCore.Services;
+
+public sealed class CustomerService : ICustomerService
+{
+    private readonly IRepository<Customer> _customers;
+    private readonly IRepository<Warehouse> _warehouses;
+    private readonly IUnitOfWork _uow;
+
+    public CustomerService(IRepository<Customer> customers, IRepository<Warehouse> warehouses, IUnitOfWork uow)
+    {
+        _customers = customers;
+        _warehouses = warehouses;
+        _uow = uow;
+    }
+
+    public async Task<PagedResponse<CustomerDto>> ListAsync(PageQuery query, EntityStatus? status, CustomerType? customerType, CancellationToken ct = default)
+    {
+        var q = _customers.Query().AsNoTracking();
+        if (!string.IsNullOrWhiteSpace(query.Q))
+        {
+            var term = query.Q.Trim();
+            q = q.Where(c => EF.Functions.ILike(c.Name, $"%{term}%")
+                             || EF.Functions.ILike(c.CustomerCode, $"%{term}%")
+                             || (c.DisplayName != null && EF.Functions.ILike(c.DisplayName, $"%{term}%")));
+        }
+        if (status is not null) q = q.Where(c => c.Status == status);
+        if (customerType is not null) q = q.Where(c => c.CustomerType == customerType);
+
+        var total = await q.CountAsync(ct);
+        var rows = await q.OrderBy(c => c.Name)
+            .Skip(query.Skip).Take(query.PageSize)
+            .Select(c => new CustomerDto(
+                c.CustomerId, c.CustomerCode, c.CustomerType, c.Name, c.DisplayName, c.Phone, c.Email,
+                c.AddressLine1, c.AddressLine2, c.City, c.Country, c.TaxRegistrationNo,
+                c.CreditLimit, c.CreditDays, c.DefaultWarehouseId, c.Status, c.CreatedAt, c.UpdatedAt))
+            .ToListAsync(ct);
+
+        return PagedResponse<CustomerDto>.Create(rows, query.Page, query.PageSize, total);
+    }
+
+    public async Task<ETagged<CustomerDto>?> GetAsync(int customerId, CancellationToken ct = default)
+    {
+        var customer = await _customers.Query().AsNoTracking()
+            .FirstOrDefaultAsync(c => c.CustomerId == customerId, ct);
+        return customer is null ? null : new ETagged<CustomerDto>(Map(customer), customer.RowVersion);
+    }
+
+    public async Task<ETagged<CustomerDto>> CreateAsync(CreateCustomerRequest request, CancellationToken ct = default)
+    {
+        var code = request.CustomerCode.Trim();
+        var name = request.Name.Trim();
+
+        if (await _customers.Query().AnyAsync(c => c.CustomerCode.ToLower() == code.ToLower(), ct))
+            throw new ConflictException($"A customer code '{code}' already exists.");
+
+        if (!string.IsNullOrWhiteSpace(request.Email))
+        {
+            var email = request.Email.Trim();
+            if (await _customers.Query().AnyAsync(c => c.Email != null && c.Email.ToLower() == email.ToLower(), ct))
+                throw new ConflictException($"A customer with email '{email}' already exists.");
+        }
+
+        if (request.DefaultWarehouseId is not null)
+        {
+            var exists = await _warehouses.Query().AnyAsync(w => w.WarehouseId == request.DefaultWarehouseId, ct);
+            if (!exists) throw new NotFoundException($"Warehouse {request.DefaultWarehouseId} was not found.");
+        }
+
+        var customer = new Customer
+        {
+            CustomerCode = code,
+            CustomerType = request.CustomerType,
+            Name = name,
+            DisplayName = Normalize(request.DisplayName),
+            Phone = Normalize(request.Phone),
+            Email = Normalize(request.Email),
+            AddressLine1 = Normalize(request.AddressLine1),
+            AddressLine2 = Normalize(request.AddressLine2),
+            City = Normalize(request.City),
+            Country = Normalize(request.Country),
+            TaxRegistrationNo = Normalize(request.TaxRegistrationNo),
+            CreditLimit = request.CreditLimit,
+            CreditDays = request.CreditDays,
+            DefaultWarehouseId = request.DefaultWarehouseId,
+            Status = EntityStatus.Active,
+            CreatedAt = DateTime.UtcNow
+        };
+
+        await _customers.AddAsync(customer, ct);
+        await _uow.SaveChangesAsync(ct);
+
+        return new ETagged<CustomerDto>(Map(customer), customer.RowVersion);
+    }
+
+    public async Task<ETagged<CustomerDto>> UpdateAsync(int customerId, UpdateCustomerRequest request, uint expectedRowVersion, CancellationToken ct = default)
+    {
+        var customer = await _customers.GetByIdAsync(customerId, ct)
+            ?? throw new NotFoundException($"Customer {customerId} was not found.");
+
+        if (customer.RowVersion != expectedRowVersion)
+            throw new DomainException(ErrorCodes.ConcurrencyConflict, "The customer was modified by another request.", 412);
+
+        var code = request.CustomerCode.Trim();
+        var name = request.Name.Trim();
+
+        if (!string.Equals(customer.CustomerCode, code, StringComparison.Ordinal)
+            && await _customers.Query().AnyAsync(c => c.CustomerCode.ToLower() == code.ToLower() && c.CustomerId != customerId, ct))
+            throw new ConflictException($"A customer code '{code}' already exists.");
+
+        if (!string.Equals(customer.Email, request.Email?.Trim(), StringComparison.OrdinalIgnoreCase)
+            && !string.IsNullOrWhiteSpace(request.Email)
+            && await _customers.Query().AnyAsync(c => c.Email != null && c.Email.ToLower() == request.Email!.Trim().ToLower() && c.CustomerId != customerId, ct))
+            throw new ConflictException($"A customer with email '{request.Email.Trim()}' already exists.");
+
+        if (request.DefaultWarehouseId is not null)
+        {
+            var exists = await _warehouses.Query().AnyAsync(w => w.WarehouseId == request.DefaultWarehouseId, ct);
+            if (!exists) throw new NotFoundException($"Warehouse {request.DefaultWarehouseId} was not found.");
+        }
+
+        customer.CustomerCode = code;
+        customer.CustomerType = request.CustomerType;
+        customer.Name = name;
+        customer.DisplayName = Normalize(request.DisplayName);
+        customer.Phone = Normalize(request.Phone);
+        customer.Email = Normalize(request.Email);
+        customer.AddressLine1 = Normalize(request.AddressLine1);
+        customer.AddressLine2 = Normalize(request.AddressLine2);
+        customer.City = Normalize(request.City);
+        customer.Country = Normalize(request.Country);
+        customer.TaxRegistrationNo = Normalize(request.TaxRegistrationNo);
+        customer.CreditLimit = request.CreditLimit;
+        customer.CreditDays = request.CreditDays;
+        customer.DefaultWarehouseId = request.DefaultWarehouseId;
+        customer.UpdatedAt = DateTime.UtcNow;
+
+        await _uow.SaveChangesAsync(ct);
+        return new ETagged<CustomerDto>(Map(customer), customer.RowVersion);
+    }
+
+    public async Task SetStatusAsync(int customerId, EntityStatus status, CancellationToken ct = default)
+    {
+        var customer = await _customers.GetByIdAsync(customerId, ct)
+            ?? throw new NotFoundException($"Customer {customerId} was not found.");
+
+        customer.Status = status;
+        customer.UpdatedAt = DateTime.UtcNow;
+        await _uow.SaveChangesAsync(ct);
+    }
+
+    private static CustomerDto Map(Customer c) => new(
+        c.CustomerId, c.CustomerCode, c.CustomerType, c.Name, c.DisplayName, c.Phone, c.Email,
+        c.AddressLine1, c.AddressLine2, c.City, c.Country, c.TaxRegistrationNo,
+        c.CreditLimit, c.CreditDays, c.DefaultWarehouseId, c.Status, c.CreatedAt, c.UpdatedAt);
+
+    private static string? Normalize(string? value) => string.IsNullOrWhiteSpace(value) ? null : value.Trim();
+}
diff --git a/Backend/ERPCore/Services/GeneralLedgerService.cs b/Backend/ERPCore/Services/GeneralLedgerService.cs
new file mode 100644
index 0000000..4b70e23
--- /dev/null
+++ b/Backend/ERPCore/Services/GeneralLedgerService.cs
@@ -0,0 +1,16 @@
+using ERPCore.Infra.Gl;
+using ERPCore.Services.Interfaces;
+
+namespace ERPCore.Services;
+
+/// <inheritdoc cref="IGeneralLedgerService"/>
+public sealed class GeneralLedgerService : IGeneralLedgerService
+{
+    private readonly IGeneralLedgerClient _client;
+
+    public GeneralLedgerService(IGeneralLedgerClient client) => _client = client;
+
+    public Task<GeneralLedgerResponse> ForwardAsync(
+        HttpMethod method, string path, string? queryString, string? contentType, Stream? body, CancellationToken ct)
+        => _client.SendAsync(method, path, queryString, contentType, body, ct);
+}
diff --git a/Backend/ERPCore/Services/Interfaces/IBundleSaleService.cs b/Backend/ERPCore/Services/Interfaces/IBundleSaleService.cs
new file mode 100644
index 0000000..b67ee2f
--- /dev/null
+++ b/Backend/ERPCore/Services/Interfaces/IBundleSaleService.cs
@@ -0,0 +1,18 @@
+using ERPCore.Common.Http;
+using ERPCore.Dtos.Common;
+using ERPCore.Dtos.Sales;
+
+namespace ERPCore.Services.Interfaces;
+
+public interface IBundleSaleService
+{
+    Task<PagedResponse<BundleSaleTemplateSummaryDto>> ListTemplatesAsync(PageQuery query, CancellationToken ct = default);
+    Task<BundleSaleTemplateDto?> GetTemplateAsync(int bundleSaleTemplateId, CancellationToken ct = default);
+    Task<PagedResponse<BundleSaleSummaryDto>> ListAsync(PageQuery query, int? customerId, int? warehouseId, CancellationToken ct = default);
+    Task<BundleSaleDto?> GetAsync(int bundleSaleId, CancellationToken ct = default);
+    Task<BundleSalePostingCheckDto> CheckPostingAsync(int bundleSaleId, CancellationToken ct = default);
+    Task<BundleSaleDto> CreateAsync(CreateBundleSaleRequest request, CancellationToken ct = default);
+    Task<BundleSaleDto> UpdateAsync(int bundleSaleId, UpdateBundleSaleRequest request, CancellationToken ct = default);
+    Task<BundleSaleDto> PostAsync(int bundleSaleId, CancellationToken ct = default);
+    Task<BundleSaleDto> CancelAsync(int bundleSaleId, CancellationToken ct = default);
+}
diff --git a/Backend/ERPCore/Services/Interfaces/ICustomerService.cs b/Backend/ERPCore/Services/Interfaces/ICustomerService.cs
new file mode 100644
index 0000000..47e837c
--- /dev/null
+++ b/Backend/ERPCore/Services/Interfaces/ICustomerService.cs
@@ -0,0 +1,15 @@
+using ERPCore.Common.Http;
+using ERPCore.Dtos.Common;
+using ERPCore.Dtos.Customers;
+using ERPCore.Domain.Enums;
+
+namespace ERPCore.Services.Interfaces;
+
+public interface ICustomerService
+{
+    Task<PagedResponse<CustomerDto>> ListAsync(PageQuery query, EntityStatus? status, CustomerType? customerType, CancellationToken ct = default);
+    Task<ETagged<CustomerDto>?> GetAsync(int customerId, CancellationToken ct = default);
+    Task<ETagged<CustomerDto>> CreateAsync(CreateCustomerRequest request, CancellationToken ct = default);
+    Task<ETagged<CustomerDto>> UpdateAsync(int customerId, UpdateCustomerRequest request, uint expectedRowVersion, CancellationToken ct = default);
+    Task SetStatusAsync(int customerId, EntityStatus status, CancellationToken ct = default);
+}
diff --git a/Backend/ERPCore/Services/Interfaces/IGeneralLedgerService.cs b/Backend/ERPCore/Services/Interfaces/IGeneralLedgerService.cs
new file mode 100644
index 0000000..eeff07b
--- /dev/null
+++ b/Backend/ERPCore/Services/Interfaces/IGeneralLedgerService.cs
@@ -0,0 +1,16 @@
+using ERPCore.Infra.Gl;
+
+namespace ERPCore.Services.Interfaces;
+
+/// <summary>
+/// Single entry point into the external General Ledger service — the one function
+/// used both by <see cref="ERPCore.Controllers.GeneralLedgerController"/> (frontend
+/// requests, forwarded verbatim) and, once wired, other ERPCore services that need to
+/// post directly to GL (e.g. GRN confirm, adjustments — docs/12-GENERAL-LEDGER-INTEGRATION.md).
+/// No business logic lives here yet; this pass only connects the transport.
+/// </summary>
+public interface IGeneralLedgerService
+{
+    Task<GeneralLedgerResponse> ForwardAsync(
+        HttpMethod method, string path, string? queryString, string? contentType, Stream? body, CancellationToken ct);
+}
diff --git a/Backend/ERPCore/Services/Interfaces/ISalesDocumentWorkflowService.cs b/Backend/ERPCore/Services/Interfaces/ISalesDocumentWorkflowService.cs
new file mode 100644
index 0000000..fc3a7b3
--- /dev/null
+++ b/Backend/ERPCore/Services/Interfaces/ISalesDocumentWorkflowService.cs
@@ -0,0 +1,9 @@
+using ERPCore.Domain.Entities;
+
+namespace ERPCore.Services.Interfaces;
+
+public interface ISalesDocumentWorkflowService
+{
+    Task<SalesInvoice> LoadEditableInvoiceAsync(int salesInvoiceId, uint expectedRowVersion, CancellationToken ct = default);
+    Task<SalesSlip> LoadEditableSlipAsync(int salesSlipId, uint expectedRowVersion, CancellationToken ct = default);
+}
diff --git a/Backend/ERPCore/Services/Interfaces/ISalesDomainService.cs b/Backend/ERPCore/Services/Interfaces/ISalesDomainService.cs
new file mode 100644
index 0000000..99372be
--- /dev/null
+++ b/Backend/ERPCore/Services/Interfaces/ISalesDomainService.cs
@@ -0,0 +1,51 @@
+using ERPCore.Domain.Enums;
+using ERPCore.Dtos.Sales;
+
+namespace ERPCore.Services.Interfaces;
+
+public interface ISalesDomainService
+{
+    Task ValidateSalesHeaderAsync(
+        int customerId,
+        int warehouseId,
+        int? cashierUserId,
+        bool requireCashierUser,
+        CancellationToken ct = default);
+
+    Task ValidateSalesLineAsync(
+        int headerWarehouseId,
+        int lineItemId,
+        int lineUomId,
+        int lineWarehouseId,
+        decimal qty,
+        decimal freeQty,
+        int? parentLineId,
+        CancellationToken ct = default);
+
+    Task<SalesPriceResolution> ResolveLinePriceAsync(
+        int itemId,
+        int warehouseId,
+        decimal? requestedUnitPrice,
+        bool allowManualOverride,
+        CancellationToken ct = default);
+
+    SalesLineComputation ComputeLine(
+        decimal qty,
+        decimal freeQty,
+        decimal unitPrice,
+        SalesDiscountMode discountMode,
+        decimal discountPct,
+        decimal discountValue,
+        decimal discountAmount,
+        decimal taxPct,
+        bool isFreeIssue);
+
+    Task<bool> IsStockedItemAsync(int itemId, CancellationToken ct = default);
+}
+
+public sealed record SalesLineComputation(
+    decimal Gross,
+    decimal DiscountTotal,
+    decimal NetUnitPrice,
+    decimal LineTotal,
+    decimal TaxAmount);
diff --git a/Backend/ERPCore/Services/Interfaces/ISalesInvoiceService.cs b/Backend/ERPCore/Services/Interfaces/ISalesInvoiceService.cs
new file mode 100644
index 0000000..c54c918
--- /dev/null
+++ b/Backend/ERPCore/Services/Interfaces/ISalesInvoiceService.cs
@@ -0,0 +1,17 @@
+using ERPCore.Common.Http;
+using ERPCore.Dtos.Common;
+using ERPCore.Dtos.Sales;
+using ERPCore.Domain.Enums;
+
+namespace ERPCore.Services.Interfaces;
+
+public interface ISalesInvoiceService
+{
+    Task<PagedResponse<SalesInvoiceSummaryDto>> ListAsync(PageQuery query, SalesInvoiceStatus? status, int? customerId, int? warehouseId, CancellationToken ct = default);
+    Task<ETagged<SalesInvoiceDto>?> GetAsync(int salesInvoiceId, CancellationToken ct = default);
+    Task<SalesInvoicePostingCheckDto> CheckPostingAsync(int salesInvoiceId, CancellationToken ct = default);
+    Task<ETagged<SalesInvoiceDto>> CreateAsync(CreateSalesInvoiceRequest request, CancellationToken ct = default);
+    Task<ETagged<SalesInvoiceDto>> UpdateAsync(int salesInvoiceId, UpdateSalesInvoiceRequest request, uint expectedRowVersion, CancellationToken ct = default);
+    Task<SalesInvoiceDto> PostAsync(int salesInvoiceId, CancellationToken ct = default);
+    Task<SalesInvoiceDto> CancelAsync(int salesInvoiceId, CancellationToken ct = default);
+}
diff --git a/Backend/ERPCore/Services/Interfaces/ISalesMappingService.cs b/Backend/ERPCore/Services/Interfaces/ISalesMappingService.cs
new file mode 100644
index 0000000..6c09cf2
--- /dev/null
+++ b/Backend/ERPCore/Services/Interfaces/ISalesMappingService.cs
@@ -0,0 +1,12 @@
+using ERPCore.Domain.Entities;
+using ERPCore.Dtos.Sales;
+
+namespace ERPCore.Services.Interfaces;
+
+public interface ISalesMappingService
+{
+    SalesInvoiceTotalsDto MapInvoiceTotals(SalesInvoice invoice);
+    SalesSlipTotalsDto MapSlipTotals(SalesSlip slip);
+    SalesInvoiceDto MapInvoice(SalesInvoice invoice);
+    SalesSlipDto MapSlip(SalesSlip slip);
+}
diff --git a/Backend/ERPCore/Services/Interfaces/ISalesPostingService.cs b/Backend/ERPCore/Services/Interfaces/ISalesPostingService.cs
new file mode 100644
index 0000000..4c9cfa3
--- /dev/null
+++ b/Backend/ERPCore/Services/Interfaces/ISalesPostingService.cs
@@ -0,0 +1,14 @@
+using ERPCore.Dtos.Sales;
+
+namespace ERPCore.Services.Interfaces;
+
+public interface ISalesPostingService
+{
+    Task<SalesInvoicePostingCheckDto> CheckInvoiceAsync(int salesInvoiceId, CancellationToken ct = default);
+    Task<SalesSlipPostingCheckDto> CheckSlipAsync(int salesSlipId, CancellationToken ct = default);
+    Task<BundleSalePostingCheckDto> CheckBundleAsync(int bundleSaleId, CancellationToken ct = default);
+
+    Task PostInvoiceAsync(int salesInvoiceId, CancellationToken ct = default);
+    Task PostSlipAsync(int salesSlipId, CancellationToken ct = default);
+    Task PostBundleAsync(int bundleSaleId, CancellationToken ct = default);
+}
diff --git a/Backend/ERPCore/Services/Interfaces/ISalesPricingService.cs b/Backend/ERPCore/Services/Interfaces/ISalesPricingService.cs
new file mode 100644
index 0000000..87617e4
--- /dev/null
+++ b/Backend/ERPCore/Services/Interfaces/ISalesPricingService.cs
@@ -0,0 +1,16 @@
+namespace ERPCore.Services.Interfaces;
+
+public interface ISalesPricingService
+{
+    Task<SalesPriceResolution> ResolveAsync(
+        int itemId,
+        int warehouseId,
+        decimal? requestedUnitPrice,
+        bool allowManualOverride,
+        CancellationToken ct = default);
+}
+
+public sealed record SalesPriceResolution(
+    decimal UnitPrice,
+    string PriceSource,
+    decimal BaseCost);
diff --git a/Backend/ERPCore/Services/Interfaces/ISalesPromotionSuggestionService.cs b/Backend/ERPCore/Services/Interfaces/ISalesPromotionSuggestionService.cs
new file mode 100644
index 0000000..97158ec
--- /dev/null
+++ b/Backend/ERPCore/Services/Interfaces/ISalesPromotionSuggestionService.cs
@@ -0,0 +1,8 @@
+using ERPCore.Dtos.Sales;
+
+namespace ERPCore.Services.Interfaces;
+
+public interface ISalesPromotionSuggestionService
+{
+    Task<SalesFreeIssueSuggestionDto?> GetFreeIssueSuggestionsAsync(int salesSlipId, CancellationToken ct = default);
+}
\ No newline at end of file
diff --git a/Backend/ERPCore/Services/Interfaces/ISalesReportService.cs b/Backend/ERPCore/Services/Interfaces/ISalesReportService.cs
new file mode 100644
index 0000000..32fa43d
--- /dev/null
+++ b/Backend/ERPCore/Services/Interfaces/ISalesReportService.cs
@@ -0,0 +1,16 @@
+using ERPCore.Dtos.Sales;
+
+namespace ERPCore.Services.Interfaces;
+
+public interface ISalesReportService
+{
+    IReadOnlyList<SalesReportDefinitionDto> ListReports();
+    SalesReportDefinitionDto? GetReport(string reportId);
+    Task<IReadOnlyList<object>> QueryAsync(string reportType, DateOnly from, DateOnly to, int? itemId, int? customerId, int? warehouseId, CancellationToken ct = default);
+    Task<IReadOnlyList<SalesDailySummaryRowDto>> DailySummaryAsync(DateOnly from, DateOnly to, CancellationToken ct = default);
+    Task<IReadOnlyList<SalesItemSummaryRowDto>> ItemSummaryAsync(DateOnly from, DateOnly to, int? itemId, int? warehouseId, CancellationToken ct = default);
+    Task<IReadOnlyList<SalesCustomerSummaryRowDto>> CustomerSummaryAsync(DateOnly from, DateOnly to, int? customerId, CancellationToken ct = default);
+    Task<IReadOnlyList<SalesWarehouseSummaryRowDto>> WarehouseSummaryAsync(DateOnly from, DateOnly to, int? warehouseId, CancellationToken ct = default);
+    Task<IReadOnlyList<SalesDiscountSummaryRowDto>> DiscountSummaryAsync(DateOnly from, DateOnly to, CancellationToken ct = default);
+    Task<IReadOnlyList<SalesFreeIssueSummaryRowDto>> FreeIssueSummaryAsync(DateOnly from, DateOnly to, CancellationToken ct = default);
+}
diff --git a/Backend/ERPCore/Services/Interfaces/ISalesSlipService.cs b/Backend/ERPCore/Services/Interfaces/ISalesSlipService.cs
new file mode 100644
index 0000000..6411b0f
--- /dev/null
+++ b/Backend/ERPCore/Services/Interfaces/ISalesSlipService.cs
@@ -0,0 +1,19 @@
+using ERPCore.Common.Http;
+using ERPCore.Dtos.Common;
+using ERPCore.Dtos.Sales;
+using ERPCore.Domain.Enums;
+
+namespace ERPCore.Services.Interfaces;
+
+public interface ISalesSlipService
+{
+    Task<PagedResponse<SalesSlipSummaryDto>> ListAsync(PageQuery query, SalesSlipStatus? status, int? customerId, int? warehouseId, CancellationToken ct = default);
+    Task<ETagged<SalesSlipDto>?> GetAsync(int salesSlipId, CancellationToken ct = default);
+    Task<PagedResponse<FreeIssueSummaryDto>> ListFreeIssuesAsync(PageQuery query, SalesSlipStatus? status, int? customerId, int? warehouseId, CancellationToken ct = default);
+    Task<ETagged<FreeIssueDto>?> GetFreeIssueAsync(int salesSlipId, CancellationToken ct = default);
+    Task<SalesSlipPostingCheckDto> CheckPostingAsync(int salesSlipId, CancellationToken ct = default);
+    Task<ETagged<SalesSlipDto>> CreateAsync(CreateSalesSlipRequest request, CancellationToken ct = default);
+    Task<ETagged<SalesSlipDto>> UpdateAsync(int salesSlipId, UpdateSalesSlipRequest request, uint expectedRowVersion, CancellationToken ct = default);
+    Task<SalesSlipDto> PostAsync(int salesSlipId, CancellationToken ct = default);
+    Task<SalesSlipDto> CancelAsync(int salesSlipId, CancellationToken ct = default);
+}
diff --git a/Backend/ERPCore/Services/SalesDocumentWorkflowService.cs b/Backend/ERPCore/Services/SalesDocumentWorkflowService.cs
new file mode 100644
index 0000000..e3a8780
--- /dev/null
+++ b/Backend/ERPCore/Services/SalesDocumentWorkflowService.cs
@@ -0,0 +1,44 @@
+using ERPCore.Domain.Entities;
+using ERPCore.Domain.Enums;
+using ERPCore.Repositories.Interfaces;
+using ERPCore.Services.Interfaces;
+using ERPCore.System.Errors;
+using Microsoft.EntityFrameworkCore;
+
+namespace ERPCore.Services;
+
+public sealed class SalesDocumentWorkflowService : ISalesDocumentWorkflowService
+{
+    private readonly IRepository<SalesInvoice> _invoices;
+    private readonly IRepository<SalesSlip> _slips;
+
+    public SalesDocumentWorkflowService(IRepository<SalesInvoice> invoices, IRepository<SalesSlip> slips)
+    {
+        _invoices = invoices;
+        _slips = slips;
+    }
+
+    public async Task<SalesInvoice> LoadEditableInvoiceAsync(int salesInvoiceId, uint expectedRowVersion, CancellationToken ct = default)
+    {
+        var invoice = await _invoices.Query().Include(x => x.Lines)
+            .FirstOrDefaultAsync(x => x.SalesInvoiceId == salesInvoiceId, ct)
+            ?? throw new NotFoundException($"Sales invoice {salesInvoiceId} was not found.");
+        if (invoice.RowVersion != expectedRowVersion)
+            throw new DomainException(ErrorCodes.ConcurrencyConflict, "The sales invoice was modified by another request.", 412);
+        if (invoice.Status != SalesInvoiceStatus.Draft)
+            throw new ConflictException($"Sales invoice {salesInvoiceId} is {invoice.Status} and cannot be edited.");
+        return invoice;
+    }
+
+    public async Task<SalesSlip> LoadEditableSlipAsync(int salesSlipId, uint expectedRowVersion, CancellationToken ct = default)
+    {
+        var slip = await _slips.Query().Include(x => x.Lines)
+            .FirstOrDefaultAsync(x => x.SalesSlipId == salesSlipId, ct)
+            ?? throw new NotFoundException($"Sales slip {salesSlipId} was not found.");
+        if (slip.RowVersion != expectedRowVersion)
+            throw new DomainException(ErrorCodes.ConcurrencyConflict, "The sales slip was modified by another request.", 412);
+        if (slip.Status != SalesSlipStatus.Draft)
+            throw new ConflictException($"Sales slip {salesSlipId} is {slip.Status} and cannot be edited.");
+        return slip;
+    }
+}
diff --git a/Backend/ERPCore/Services/SalesDomainService.cs b/Backend/ERPCore/Services/SalesDomainService.cs
new file mode 100644
index 0000000..8fb1a93
--- /dev/null
+++ b/Backend/ERPCore/Services/SalesDomainService.cs
@@ -0,0 +1,110 @@
+using ERPCore.Domain.Entities;
+using ERPCore.Domain.Enums;
+using ERPCore.Repositories.Interfaces;
+using ERPCore.Services.Interfaces;
+using ERPCore.System.Errors;
+using Microsoft.EntityFrameworkCore;
+
+namespace ERPCore.Services;
+
+public sealed class SalesDomainService : ISalesDomainService
+{
+    private readonly IRepository<Customer> _customers;
+    private readonly IRepository<Warehouse> _warehouses;
+    private readonly IRepository<User> _users;
+    private readonly IRepository<Item> _items;
+    private readonly IRepository<Uom> _uoms;
+    private readonly ISalesPricingService _pricing;
+
+    public SalesDomainService(
+        IRepository<Customer> customers,
+        IRepository<Warehouse> warehouses,
+        IRepository<User> users,
+        IRepository<Item> items,
+        IRepository<Uom> uoms,
+        ISalesPricingService pricing)
+    {
+        _customers = customers;
+        _warehouses = warehouses;
+        _users = users;
+        _items = items;
+        _uoms = uoms;
+        _pricing = pricing;
+    }
+
+    public async Task ValidateSalesHeaderAsync(int customerId, int warehouseId, int? cashierUserId, bool requireCashierUser, CancellationToken ct = default)
+    {
+        if (!await _customers.Query().AnyAsync(x => x.CustomerId == customerId, ct))
+            throw new NotFoundException($"Customer {customerId} was not found.");
+        if (!await _warehouses.Query().AnyAsync(x => x.WarehouseId == warehouseId, ct))
+            throw new NotFoundException($"Warehouse {warehouseId} was not found.");
+        if (requireCashierUser)
+        {
+            if (cashierUserId is null)
+                throw new DomainException(ErrorCodes.Validation, "Cashier user is required.", 422);
+            if (!await _users.Query().AnyAsync(x => x.UserId == cashierUserId, ct))
+                throw new NotFoundException($"User {cashierUserId} was not found.");
+        }
+    }
+
+    public async Task ValidateSalesLineAsync(
+        int headerWarehouseId, int lineItemId, int lineUomId, int lineWarehouseId, decimal qty, decimal freeQty, int? parentLineId, CancellationToken ct = default)
+    {
+        if (qty <= 0)
+            throw new DomainException(ErrorCodes.Validation, "Sales line quantity must be greater than zero.", 422);
+        if (freeQty < 0)
+            throw new DomainException(ErrorCodes.Validation, "Sales free quantity cannot be negative.", 422);
+        if (parentLineId is not null && parentLineId <= 0)
+            throw new DomainException(ErrorCodes.Validation, "Parent line id must be positive when supplied.", 422);
+        if (lineWarehouseId != headerWarehouseId)
+            throw new DomainException(ErrorCodes.Validation, $"Sales line warehouse {lineWarehouseId} must match header warehouse {headerWarehouseId}.", 422);
+        if (!await _items.Query().AnyAsync(x => x.ItemId == lineItemId, ct))
+            throw new NotFoundException($"Item {lineItemId} was not found.");
+        if (!await _uoms.Query().AnyAsync(x => x.UomId == lineUomId, ct))
+            throw new NotFoundException($"UOM {lineUomId} was not found.");
+        if (!await _warehouses.Query().AnyAsync(x => x.WarehouseId == lineWarehouseId, ct))
+            throw new NotFoundException($"Warehouse {lineWarehouseId} was not found.");
+    }
+
+    public Task<SalesPriceResolution> ResolveLinePriceAsync(int itemId, int warehouseId, decimal? requestedUnitPrice, bool allowManualOverride, CancellationToken ct = default)
+        => _pricing.ResolveAsync(itemId, warehouseId, requestedUnitPrice, allowManualOverride, ct);
+
+    public SalesLineComputation ComputeLine(
+        decimal qty,
+        decimal freeQty,
+        decimal unitPrice,
+        SalesDiscountMode discountMode,
+        decimal discountPct,
+        decimal discountValue,
+        decimal discountAmount,
+        decimal taxPct,
+        bool isFreeIssue)
+    {
+        var gross = qty * unitPrice;
+        var discountTotal = isFreeIssue
+            ? 0m
+            : CalculateDiscount(gross, discountMode, discountPct, discountValue, discountAmount);
+        var netUnit = qty > 0 ? (gross - discountTotal) / qty : 0m;
+        var lineTotal = gross - discountTotal;
+        var taxAmount = lineTotal * (taxPct / 100m);
+        return new SalesLineComputation(gross, discountTotal, netUnit, lineTotal, taxAmount);
+    }
+
+    public async Task<bool> IsStockedItemAsync(int itemId, CancellationToken ct = default)
+        => await _items.Query().AsNoTracking()
+            .Where(x => x.ItemId == itemId)
+            .Select(x => x.StockNature == StockNature.Stocked)
+            .FirstAsync(ct);
+
+    private static decimal CalculateDiscount(decimal gross, SalesDiscountMode mode, decimal discountPct, decimal discountValue, decimal legacyDiscountAmount)
+    {
+        var computed = mode == SalesDiscountMode.Amount
+            ? discountValue
+            : gross * (discountPct / 100m);
+
+        if (computed <= 0m && legacyDiscountAmount > 0m)
+            computed = legacyDiscountAmount;
+
+        return Math.Min(gross, Math.Max(0m, computed));
+    }
+}
diff --git a/Backend/ERPCore/Services/SalesInvoiceService.cs b/Backend/ERPCore/Services/SalesInvoiceService.cs
new file mode 100644
index 0000000..61d9e0e
--- /dev/null
+++ b/Backend/ERPCore/Services/SalesInvoiceService.cs
@@ -0,0 +1,195 @@
+using ERPCore.Common.Http;
+using ERPCore.Domain;
+using ERPCore.Domain.Entities;
+using ERPCore.Domain.Enums;
+using ERPCore.Dtos.Common;
+using ERPCore.Dtos.Sales;
+using ERPCore.Infra.Auth;
+using ERPCore.Infra.UoW;
+using ERPCore.Repositories.Interfaces;
+using ERPCore.Services.Interfaces;
+using ERPCore.Services.Stock;
+using ERPCore.System.Errors;
+using Microsoft.EntityFrameworkCore;
+
+namespace ERPCore.Services;
+
+public sealed class SalesInvoiceService : ISalesInvoiceService
+{
+    private readonly IRepository<SalesInvoice> _invoices;
+    private readonly IRepository<Customer> _customers;
+    private readonly IRepository<Item> _items;
+    private readonly IRepository<Uom> _uoms;
+    private readonly IRepository<Warehouse> _warehouses;
+    private readonly ISalesDomainService _sales;
+    private readonly ISalesPostingService _posting;
+    private readonly ISalesMappingService _mapping;
+    private readonly ISalesDocumentWorkflowService _workflow;
+    private readonly ICurrentUser _currentUser;
+    private readonly INumberSequenceService _numbers;
+    private readonly IUnitOfWork _uow;
+
+    public SalesInvoiceService(
+        IRepository<SalesInvoice> invoices, IRepository<Customer> customers, IRepository<Item> items,
+        IRepository<Uom> uoms, IRepository<Warehouse> warehouses, ISalesDomainService sales, ISalesPostingService posting, ISalesMappingService mapping,
+        ISalesDocumentWorkflowService workflow,
+        ICurrentUser currentUser, INumberSequenceService numbers, IUnitOfWork uow)
+    {
+        _invoices = invoices;
+        _customers = customers;
+        _items = items;
+        _uoms = uoms;
+        _warehouses = warehouses;
+        _sales = sales;
+        _posting = posting;
+        _mapping = mapping;
+        _workflow = workflow;
+        _currentUser = currentUser;
+        _numbers = numbers;
+        _uow = uow;
+    }
+
+    public async Task<PagedResponse<SalesInvoiceSummaryDto>> ListAsync(PageQuery query, SalesInvoiceStatus? status, int? customerId, int? warehouseId, CancellationToken ct = default)
+    {
+        IQueryable<SalesInvoice> q = _invoices.Query().AsNoTracking().Include(x => x.Lines);
+        if (!string.IsNullOrWhiteSpace(query.Q))
+        {
+            var term = query.Q.Trim();
+            q = q.Where(x => EF.Functions.ILike(x.InvoiceNo, $"%{term}%") || EF.Functions.ILike(x.CustomerSnapshotName, $"%{term}%"));
+        }
+        if (status is not null) q = q.Where(x => x.Status == status);
+        if (customerId is not null) q = q.Where(x => x.CustomerId == customerId);
+        if (warehouseId is not null) q = q.Where(x => x.WarehouseId == warehouseId);
+
+        var total = await q.CountAsync(ct);
+        var rows = await q.OrderByDescending(x => x.SalesInvoiceId).Skip(query.Skip).Take(query.PageSize).ToListAsync(ct);
+
+        return PagedResponse<SalesInvoiceSummaryDto>.Create(rows.Select(MapSummary).ToList(), query.Page, query.PageSize, total);
+    }
+
+    public async Task<ETagged<SalesInvoiceDto>?> GetAsync(int salesInvoiceId, CancellationToken ct = default)
+    {
+        var invoice = await _invoices.Query().AsNoTracking().Include(x => x.Lines)
+            .FirstOrDefaultAsync(x => x.SalesInvoiceId == salesInvoiceId, ct);
+        return invoice is null ? null : new ETagged<SalesInvoiceDto>(_mapping.MapInvoice(invoice), invoice.RowVersion);
+    }
+
+    public Task<SalesInvoicePostingCheckDto> CheckPostingAsync(int salesInvoiceId, CancellationToken ct = default)
+        => _posting.CheckInvoiceAsync(salesInvoiceId, ct);
+
+    public async Task<ETagged<SalesInvoiceDto>> CreateAsync(CreateSalesInvoiceRequest request, CancellationToken ct = default)
+    {
+        await _sales.ValidateSalesHeaderAsync(request.CustomerId, request.WarehouseId, null, false, ct);
+        var invoice = new SalesInvoice
+        {
+            InvoiceNo = await _numbers.NextAsync(DocumentTypes.SalesInvoice, ct),
+            InvoiceDate = DateTime.UtcNow,
+            CustomerId = request.CustomerId,
+            WarehouseId = request.WarehouseId,
+            InvoiceType = request.InvoiceType,
+            Status = SalesInvoiceStatus.Draft,
+            CreatedBy = _currentUser.AuditUserId,
+            CreatedAt = DateTime.UtcNow
+        };
+        invoice.CustomerSnapshotName = await _customers.Query().Where(x => x.CustomerId == request.CustomerId).Select(x => x.DisplayName ?? x.Name).FirstAsync(ct);
+        invoice.CustomerSnapshotTaxNo = await _customers.Query().Where(x => x.CustomerId == request.CustomerId).Select(x => x.TaxRegistrationNo).FirstAsync(ct);
+        invoice.Lines = await BuildLinesAsync(request.WarehouseId, request.Lines, ct);
+        Recalculate(invoice);
+
+        await _invoices.AddAsync(invoice, ct);
+        await _uow.SaveChangesAsync(ct);
+        return new ETagged<SalesInvoiceDto>(_mapping.MapInvoice(invoice), invoice.RowVersion);
+    }
+
+    public async Task<ETagged<SalesInvoiceDto>> UpdateAsync(int salesInvoiceId, UpdateSalesInvoiceRequest request, uint expectedRowVersion, CancellationToken ct = default)
+    {
+        var invoice = await _workflow.LoadEditableInvoiceAsync(salesInvoiceId, expectedRowVersion, ct);
+
+        await _sales.ValidateSalesHeaderAsync(request.CustomerId, request.WarehouseId, null, false, ct);
+        invoice.CustomerId = request.CustomerId;
+        invoice.WarehouseId = request.WarehouseId;
+        invoice.InvoiceType = request.InvoiceType;
+        invoice.CustomerSnapshotName = await _customers.Query().Where(x => x.CustomerId == request.CustomerId).Select(x => x.DisplayName ?? x.Name).FirstAsync(ct);
+        invoice.CustomerSnapshotTaxNo = await _customers.Query().Where(x => x.CustomerId == request.CustomerId).Select(x => x.TaxRegistrationNo).FirstAsync(ct);
+        invoice.Lines.Clear();
+        foreach (var line in await BuildLinesAsync(request.WarehouseId, request.Lines, ct)) invoice.Lines.Add(line);
+        Recalculate(invoice);
+        invoice.UpdatedAt = DateTime.UtcNow;
+        await _uow.SaveChangesAsync(ct);
+        return new ETagged<SalesInvoiceDto>(_mapping.MapInvoice(invoice), invoice.RowVersion);
+    }
+
+    public async Task<SalesInvoiceDto> PostAsync(int salesInvoiceId, CancellationToken ct = default)
+        {
+            await _posting.PostInvoiceAsync(salesInvoiceId, ct);
+            var invoice = await _invoices.Query().AsNoTracking().Include(x => x.Lines)
+                .FirstAsync(x => x.SalesInvoiceId == salesInvoiceId, ct);
+            return _mapping.MapInvoice(invoice);
+        }
+
+    public async Task<SalesInvoiceDto> CancelAsync(int salesInvoiceId, CancellationToken ct = default)
+    {
+        var invoice = await _invoices.Query().Include(x => x.Lines).FirstOrDefaultAsync(x => x.SalesInvoiceId == salesInvoiceId, ct)
+            ?? throw new NotFoundException($"Sales invoice {salesInvoiceId} was not found.");
+        if (invoice.Status != SalesInvoiceStatus.Draft)
+            throw new ConflictException($"Sales invoice {salesInvoiceId} is {invoice.Status} and cannot be cancelled.");
+        invoice.Status = SalesInvoiceStatus.Cancelled;
+        invoice.UpdatedAt = DateTime.UtcNow;
+        await _uow.SaveChangesAsync(ct);
+        return _mapping.MapInvoice(invoice);
+    }
+
+    private async Task<List<SalesInvoiceLine>> BuildLinesAsync(int headerWarehouseId, List<CreateSalesInvoiceLineRequest> requests, CancellationToken ct)
+    {
+        var lines = new List<SalesInvoiceLine>();
+        foreach (var r in requests)
+        {
+            var item = await _items.Query().AsNoTracking().FirstAsync(x => x.ItemId == r.ItemId, ct);
+            await _sales.ValidateSalesLineAsync(headerWarehouseId, r.ItemId, r.UomId, r.WarehouseId, r.Qty, r.FreeQty, r.ParentLineId, ct);
+            var resolved = await _sales.ResolveLinePriceAsync(r.ItemId, r.WarehouseId, r.UnitPrice, r.AllowManualPriceOverride, ct);
+            var unitPrice = resolved.UnitPrice;
+            var priceSource = resolved.PriceSource;
+
+            var calc = _sales.ComputeLine(r.Qty, r.FreeQty, unitPrice, r.DiscountMode, r.DiscountPct, r.DiscountValue, r.DiscountAmount, r.TaxPct, r.IsFreeIssue);
+
+            lines.Add(new SalesInvoiceLine
+            {
+                ItemId = r.ItemId,
+                Description = item.Name,
+                Qty = r.Qty,
+                FreeQty = r.FreeQty,
+                UomId = r.UomId,
+                WarehouseId = r.WarehouseId,
+                UnitPrice = unitPrice,
+                BaseCost = unitPrice,
+                PriceSource = priceSource,
+                DiscountPct = r.DiscountPct,
+                DiscountAmount = calc.DiscountTotal,
+                DiscountMode = r.DiscountMode,
+                NetUnitPrice = calc.NetUnitPrice,
+                LineTotal = calc.LineTotal,
+                TaxPct = r.TaxPct,
+                TaxAmount = calc.TaxAmount,
+                IsFreeIssue = r.IsFreeIssue,
+                ParentLineId = r.ParentLineId
+            });
+        }
+        return lines;
+    }
+
+    private static void Recalculate(SalesInvoice invoice)
+    {
+        invoice.Subtotal = invoice.Lines.Sum(x => x.Qty * x.UnitPrice);
+        invoice.DiscountTotal = invoice.Lines.Sum(x => x.DiscountAmount);
+        invoice.TaxTotal = invoice.Lines.Sum(x => x.TaxAmount);
+        invoice.GrandTotal = invoice.Lines.Sum(x => x.LineTotal) + invoice.TaxTotal;
+        invoice.RoundOff = 0m;
+        invoice.NetPayable = invoice.GrandTotal + invoice.RoundOff;
+        invoice.PaidAmount = 0m;
+        invoice.BalanceAmount = invoice.NetPayable;
+    }
+
+    private SalesInvoiceSummaryDto MapSummary(SalesInvoice x) => new(
+        x.SalesInvoiceId, x.InvoiceNo, x.InvoiceDate, x.CustomerId, x.CustomerSnapshotName,
+        x.WarehouseId, x.InvoiceType, x.Status, _mapping.MapInvoiceTotals(x), x.CreatedAt);
+}
diff --git a/Backend/ERPCore/Services/SalesMappingService.cs b/Backend/ERPCore/Services/SalesMappingService.cs
new file mode 100644
index 0000000..4d60780
--- /dev/null
+++ b/Backend/ERPCore/Services/SalesMappingService.cs
@@ -0,0 +1,51 @@
+using ERPCore.Domain.Entities;
+using ERPCore.Dtos.Sales;
+using ERPCore.Services.Interfaces;
+
+namespace ERPCore.Services;
+
+public sealed class SalesMappingService : ISalesMappingService
+{
+    public SalesInvoiceTotalsDto MapInvoiceTotals(SalesInvoice invoice)
+        => new(
+            invoice.Subtotal,
+            invoice.DiscountTotal,
+            invoice.Lines.Sum(l => l.FreeQty),
+            invoice.TaxTotal,
+            invoice.GrandTotal,
+            invoice.RoundOff,
+            invoice.NetPayable,
+            invoice.PaidAmount,
+            invoice.BalanceAmount);
+
+    public SalesSlipTotalsDto MapSlipTotals(SalesSlip slip)
+        => new(
+            slip.Subtotal,
+            slip.DiscountTotal,
+            slip.Lines.Sum(l => l.FreeQty),
+            slip.TaxTotal,
+            slip.GrandTotal,
+            slip.PaidAmount,
+            slip.BalanceAmount);
+
+    public SalesInvoiceDto MapInvoice(SalesInvoice invoice)
+        => new(
+            invoice.SalesInvoiceId, invoice.InvoiceNo, invoice.InvoiceDate, invoice.CustomerId,
+            invoice.CustomerSnapshotName, invoice.CustomerSnapshotTaxNo, invoice.WarehouseId,
+            invoice.InvoiceType, invoice.Status, invoice.CreatedBy, invoice.CreatedAt, invoice.UpdatedAt,
+            MapInvoiceTotals(invoice),
+            invoice.Lines.Select(l => new SalesInvoiceLineDto(
+                l.SalesInvoiceLineId, l.ItemId, l.Description, l.Qty, l.FreeQty, l.UomId, l.WarehouseId,
+                l.UnitPrice, l.BaseCost, l.PriceSource, l.DiscountPct, l.DiscountAmount, l.DiscountMode,
+                l.NetUnitPrice, l.LineTotal, l.TaxPct, l.TaxAmount, l.IsFreeIssue, l.ParentLineId)).ToList());
+
+    public SalesSlipDto MapSlip(SalesSlip slip)
+        => new(
+            slip.SalesSlipId, slip.SlipNo, slip.SlipDate, slip.CustomerId, slip.CustomerSnapshotName,
+            slip.WarehouseId, slip.CashierUserId, slip.Status, slip.CreatedAt, slip.UpdatedAt,
+            MapSlipTotals(slip),
+            slip.Lines.Select(l => new SalesSlipLineDto(
+                l.SalesSlipLineId, l.ItemId, l.Description, l.Qty, l.FreeQty, l.UomId, l.WarehouseId,
+                l.UnitPrice, l.BaseCost, l.PriceSource, l.DiscountPct, l.DiscountAmount, l.DiscountMode,
+                l.NetUnitPrice, l.LineTotal, l.TaxPct, l.TaxAmount, l.IsFreeIssue, l.ParentLineId)).ToList());
+}
diff --git a/Backend/ERPCore/Services/SalesPostingService.cs b/Backend/ERPCore/Services/SalesPostingService.cs
new file mode 100644
index 0000000..556ab58
--- /dev/null
+++ b/Backend/ERPCore/Services/SalesPostingService.cs
@@ -0,0 +1,214 @@
+using ERPCore.Domain;
+using ERPCore.Domain.Entities;
+using ERPCore.Domain.Enums;
+using ERPCore.Dtos.Sales;
+using ERPCore.Infra.Auth;
+using ERPCore.Infra.UoW;
+using ERPCore.Repositories.Interfaces;
+using ERPCore.Services.Interfaces;
+using ERPCore.Services.Stock;
+using ERPCore.System.Errors;
+using Microsoft.EntityFrameworkCore;
+
+namespace ERPCore.Services;
+
+public sealed class SalesPostingService : ISalesPostingService
+{
+    private readonly IRepository<SalesInvoice> _invoices;
+    private readonly IRepository<SalesSlip> _slips;
+    private readonly IRepository<BundleSale> _bundles;
+    private readonly IRepository<Item> _items;
+    private readonly IFifoCostingService _fifo;
+    private readonly ISalesDomainService _sales;
+    private readonly ICurrentUser _currentUser;
+    private readonly IUnitOfWork _uow;
+
+    public SalesPostingService(
+        IRepository<SalesInvoice> invoices,
+        IRepository<SalesSlip> slips,
+        IRepository<BundleSale> bundles,
+        IRepository<Item> items,
+        IFifoCostingService fifo,
+        ISalesDomainService sales,
+        ICurrentUser currentUser,
+        IUnitOfWork uow)
+    {
+        _invoices = invoices;
+        _slips = slips;
+        _bundles = bundles;
+        _items = items;
+        _fifo = fifo;
+        _sales = sales;
+        _currentUser = currentUser;
+        _uow = uow;
+    }
+
+    public async Task<SalesInvoicePostingCheckDto> CheckInvoiceAsync(int salesInvoiceId, CancellationToken ct = default)
+    {
+        var invoice = await _invoices.Query().AsNoTracking().Include(x => x.Lines)
+            .FirstOrDefaultAsync(x => x.SalesInvoiceId == salesInvoiceId, ct)
+            ?? throw new NotFoundException($"Sales invoice {salesInvoiceId} was not found.");
+
+        if (invoice.Status != SalesInvoiceStatus.Draft)
+            return new SalesInvoicePostingCheckDto(invoice.SalesInvoiceId, invoice.InvoiceNo, invoice.Status, false, Array.Empty<SalesInvoicePostingIssueDto>());
+
+        var issues = new List<SalesInvoicePostingIssueDto>();
+        foreach (var line in invoice.Lines)
+        {
+            if (!await _sales.IsStockedItemAsync(line.ItemId, ct))
+                continue;
+            var requestedQty = line.Qty + line.FreeQty;
+            var available = await _fifo.GetOnHandAsync(line.ItemId, line.WarehouseId, ct);
+            if (available >= requestedQty) continue;
+
+            var item = await _items.Query().AsNoTracking()
+                .Where(x => x.ItemId == line.ItemId)
+                .Select(x => new { x.Sku, x.Name })
+                .FirstAsync(ct);
+
+            issues.Add(new SalesInvoicePostingIssueDto(
+                line.SalesInvoiceLineId, line.ItemId, item.Sku, item.Name, line.WarehouseId,
+                requestedQty, available, requestedQty - available, line.IsFreeIssue));
+        }
+
+        return new SalesInvoicePostingCheckDto(invoice.SalesInvoiceId, invoice.InvoiceNo, invoice.Status, issues.Count == 0, issues);
+    }
+
+    public async Task<SalesSlipPostingCheckDto> CheckSlipAsync(int salesSlipId, CancellationToken ct = default)
+    {
+        var slip = await _slips.Query().AsNoTracking().Include(x => x.Lines)
+            .FirstOrDefaultAsync(x => x.SalesSlipId == salesSlipId, ct)
+            ?? throw new NotFoundException($"Sales slip {salesSlipId} was not found.");
+
+        if (slip.Status != SalesSlipStatus.Draft)
+            return new SalesSlipPostingCheckDto(slip.SalesSlipId, slip.SlipNo, slip.Status, false, Array.Empty<SalesSlipPostingIssueDto>());
+
+        var issues = new List<SalesSlipPostingIssueDto>();
+        foreach (var line in slip.Lines)
+        {
+            if (!await _sales.IsStockedItemAsync(line.ItemId, ct))
+                continue;
+            var requestedQty = line.Qty + line.FreeQty;
+            var available = await _fifo.GetOnHandAsync(line.ItemId, line.WarehouseId, ct);
+            if (available >= requestedQty) continue;
+
+            var item = await _items.Query().AsNoTracking()
+                .Where(x => x.ItemId == line.ItemId)
+                .Select(x => new { x.Sku, x.Name })
+                .FirstAsync(ct);
+
+            issues.Add(new SalesSlipPostingIssueDto(
+                line.SalesSlipLineId, line.ItemId, item.Sku, item.Name, line.WarehouseId,
+                requestedQty, available, requestedQty - available, line.IsFreeIssue));
+        }
+
+        return new SalesSlipPostingCheckDto(slip.SalesSlipId, slip.SlipNo, slip.Status, issues.Count == 0, issues);
+    }
+
+    public async Task<BundleSalePostingCheckDto> CheckBundleAsync(int bundleSaleId, CancellationToken ct = default)
+    {
+        var bundle = await _bundles.Query().AsNoTracking().Include(x => x.Lines)
+            .FirstOrDefaultAsync(x => x.BundleSaleId == bundleSaleId, ct)
+            ?? throw new NotFoundException($"Bundle sale {bundleSaleId} was not found.");
+
+        if (bundle.Status != BundleSaleStatus.Draft)
+            return new BundleSalePostingCheckDto(bundle.BundleSaleId, bundle.BundleNo, bundle.Status, false, Array.Empty<BundleSalePostingIssueDto>());
+
+        var issues = new List<BundleSalePostingIssueDto>();
+        foreach (var line in bundle.Lines.Where(l => l.IncludeInBundle))
+        {
+            if (!await _sales.IsStockedItemAsync(line.ItemId, ct))
+                continue;
+            var available = await _fifo.GetOnHandAsync(line.ItemId, line.WarehouseId, ct);
+            if (available >= line.Qty) continue;
+
+            var item = await _items.Query().AsNoTracking()
+                .Where(x => x.ItemId == line.ItemId)
+                .Select(x => new { x.Sku, x.Name })
+                .FirstAsync(ct);
+
+            issues.Add(new BundleSalePostingIssueDto(line.BundleSaleLineId, line.ItemId, item.Sku, item.Name, line.WarehouseId, line.Qty, available, line.Qty - available));
+        }
+
+        return new BundleSalePostingCheckDto(bundle.BundleSaleId, bundle.BundleNo, bundle.Status, issues.Count == 0, issues);
+    }
+
+    public Task PostInvoiceAsync(int salesInvoiceId, CancellationToken ct = default)
+        => PostAsync(
+            load: () => _invoices.Query().Include(x => x.Lines).FirstOrDefaultAsync(x => x.SalesInvoiceId == salesInvoiceId, ct),
+            notFoundMessage: $"Sales invoice {salesInvoiceId} was not found.",
+            statusSelector: x => x.Status,
+            ensureDraftMessage: x => $"Sales invoice {x.SalesInvoiceId} is {x.Status} and cannot be posted.",
+            getLines: x => x.Lines.Select(l => new PostingLine(l.ItemId, l.WarehouseId, l.Qty + l.FreeQty, l.Qty, l.FreeQty)),
+            setPosted: x => x.Status = SalesInvoiceStatus.Posted,
+            setUpdated: x => x.UpdatedAt = DateTime.UtcNow,
+            sourceDocType: nameof(SalesInvoice),
+            getDocId: x => x.SalesInvoiceId,
+            ct: ct);
+
+    public Task PostSlipAsync(int salesSlipId, CancellationToken ct = default)
+        => PostAsync(
+            load: () => _slips.Query().Include(x => x.Lines).FirstOrDefaultAsync(x => x.SalesSlipId == salesSlipId, ct),
+            notFoundMessage: $"Sales slip {salesSlipId} was not found.",
+            statusSelector: x => x.Status,
+            ensureDraftMessage: x => $"Sales slip {x.SalesSlipId} is {x.Status} and cannot be posted.",
+            getLines: x => x.Lines.Select(l => new PostingLine(l.ItemId, l.WarehouseId, l.Qty + l.FreeQty, l.Qty, l.FreeQty)),
+            setPosted: x => x.Status = SalesSlipStatus.Posted,
+            setUpdated: x => x.UpdatedAt = DateTime.UtcNow,
+            sourceDocType: nameof(SalesSlip),
+            getDocId: x => x.SalesSlipId,
+            ct: ct);
+
+    public Task PostBundleAsync(int bundleSaleId, CancellationToken ct = default)
+        => PostAsync(
+            load: () => _bundles.Query().Include(x => x.Lines).FirstOrDefaultAsync(x => x.BundleSaleId == bundleSaleId, ct),
+            notFoundMessage: $"Bundle sale {bundleSaleId} was not found.",
+            statusSelector: x => x.Status,
+            ensureDraftMessage: x => $"Bundle sale {x.BundleSaleId} is {x.Status} and cannot be posted.",
+            getLines: x => x.Lines.Where(l => l.IncludeInBundle).Select(l => new PostingLine(l.ItemId, l.WarehouseId, l.Qty, l.Qty, 0m)),
+            setPosted: x => x.Status = BundleSaleStatus.Posted,
+            setUpdated: x => x.UpdatedAt = DateTime.UtcNow,
+            sourceDocType: nameof(BundleSale),
+            getDocId: x => x.BundleSaleId,
+            ct: ct);
+
+    private async Task PostAsync<T>(
+        Func<Task<T?>> load,
+        string notFoundMessage,
+        Func<T, object> statusSelector,
+        Func<T, string> ensureDraftMessage,
+        Func<T, IEnumerable<PostingLine>> getLines,
+        Action<T> setPosted,
+        Action<T> setUpdated,
+        string sourceDocType,
+        Func<T, int> getDocId,
+        CancellationToken ct)
+        where T : class
+    {
+        var doc = await load() ?? throw new NotFoundException(notFoundMessage);
+        var status = statusSelector(doc);
+        var statusValue = status?.ToString() ?? string.Empty;
+        if (!string.Equals(statusValue, "Draft", StringComparison.Ordinal))
+            throw new ConflictException(ensureDraftMessage(doc));
+
+        await _uow.ExecuteInTransactionAsync(async token =>
+        {
+            foreach (var line in getLines(doc))
+            {
+                if (line.Qty <= 0) continue;
+                if (!await _sales.IsStockedItemAsync(line.ItemId, token))
+                    continue;
+
+                var consumed = await _fifo.ConsumeAsync(line.ItemId, line.WarehouseId, null, line.Qty, token);
+                var cost = consumed.Count == 0 ? 0m : consumed.Sum(x => x.Qty * x.UnitCost) / consumed.Sum(x => x.Qty);
+                await _fifo.PostLedgerAsync(line.ItemId, line.WarehouseId, null, null, null, _currentUser.AuditUserId,
+                    Direction.Out, line.Qty, cost, 0m, sourceDocType, getDocId(doc), DateTime.UtcNow, token);
+            }
+
+            setPosted(doc);
+            setUpdated(doc);
+        }, ct);
+    }
+
+    private sealed record PostingLine(int ItemId, int WarehouseId, decimal Qty, decimal PaidQty, decimal FreeQty);
+}
diff --git a/Backend/ERPCore/Services/SalesPricingService.cs b/Backend/ERPCore/Services/SalesPricingService.cs
new file mode 100644
index 0000000..b8d09b4
--- /dev/null
+++ b/Backend/ERPCore/Services/SalesPricingService.cs
@@ -0,0 +1,79 @@
+using ERPCore.Domain;
+using ERPCore.Domain.Entities;
+using ERPCore.Domain.Enums;
+using ERPCore.Repositories.Interfaces;
+using ERPCore.Services.Interfaces;
+using ERPCore.Services.Stock;
+using Microsoft.EntityFrameworkCore;
+
+namespace ERPCore.Services;
+
+public sealed class SalesPricingService : ISalesPricingService
+{
+    private readonly IRepository<Item> _items;
+    private readonly IRepository<GrnLine> _grnLines;
+    private readonly IFifoCostingService _fifo;
+
+    public SalesPricingService(IRepository<Item> items, IRepository<GrnLine> grnLines, IFifoCostingService fifo)
+    {
+        _items = items;
+        _grnLines = grnLines;
+        _fifo = fifo;
+    }
+
+    public async Task<SalesPriceResolution> ResolveAsync(
+        int itemId, int warehouseId, decimal? requestedUnitPrice, bool allowManualOverride, CancellationToken ct = default)
+    {
+        var item = await _items.Query().AsNoTracking().FirstOrDefaultAsync(x => x.ItemId == itemId, ct)
+            ?? throw new InvalidOperationException($"Item {itemId} was not found.");
+
+        if (requestedUnitPrice is not null)
+        {
+            if (!allowManualOverride)
+            {
+                if (item.SalePrice.HasValue)
+                    return new SalesPriceResolution(item.SalePrice.Value, "SALE_PRICE", item.SalePrice.Value);
+
+                var grnPrice = await GetWeightedGrnPriceAsync(itemId, warehouseId, ct);
+                if (grnPrice is not null)
+                    return new SalesPriceResolution(grnPrice.Value, "GRN_WEIGHTED_AVG", grnPrice.Value);
+
+                return new SalesPriceResolution(await GetFifoFallbackPriceAsync(itemId, warehouseId, ct), "FIFO_AVG", 0m);
+            }
+
+            return new SalesPriceResolution(requestedUnitPrice.Value, "MANUAL", requestedUnitPrice.Value);
+        }
+
+        if (item.SalePrice.HasValue)
+            return new SalesPriceResolution(item.SalePrice.Value, "SALE_PRICE", item.SalePrice.Value);
+
+        var weighted = await GetWeightedGrnPriceAsync(itemId, warehouseId, ct);
+        if (weighted is not null)
+            return new SalesPriceResolution(weighted.Value, "GRN_WEIGHTED_AVG", weighted.Value);
+
+        return new SalesPriceResolution(await GetFifoFallbackPriceAsync(itemId, warehouseId, ct), "FIFO_AVG", 0m);
+    }
+
+    private async Task<decimal?> GetWeightedGrnPriceAsync(int itemId, int warehouseId, CancellationToken ct)
+    {
+        var rows = await _grnLines.Query().AsNoTracking()
+            .Where(l => l.ItemId == itemId
+                        && l.Grn != null
+                        && l.Grn.WarehouseId == warehouseId
+                        && l.Grn.Status == GrnStatus.Confirmed)
+            .Select(l => new { l.Qty, l.ReceivedValue })
+            .ToListAsync(ct);
+
+        var totalQty = rows.Sum(x => x.Qty);
+        if (totalQty <= 0) return null;
+
+        var totalValue = rows.Sum(x => x.ReceivedValue);
+        return totalValue / totalQty;
+    }
+
+    private async Task<decimal> GetFifoFallbackPriceAsync(int itemId, int warehouseId, CancellationToken ct)
+    {
+        var valuation = await _fifo.GetValuationAsync(itemId, warehouseId, ct);
+        return valuation.TotalQty > 0 ? valuation.TotalValue / valuation.TotalQty : 0m;
+    }
+}
diff --git a/Backend/ERPCore/Services/SalesPromotionSuggestionService.cs b/Backend/ERPCore/Services/SalesPromotionSuggestionService.cs
new file mode 100644
index 0000000..bdec4a0
--- /dev/null
+++ b/Backend/ERPCore/Services/SalesPromotionSuggestionService.cs
@@ -0,0 +1,74 @@
+using ERPCore.Domain.Entities;
+using ERPCore.Domain.Enums;
+using ERPCore.Dtos.Sales;
+using ERPCore.Repositories.Interfaces;
+using ERPCore.Services.Interfaces;
+using Microsoft.EntityFrameworkCore;
+
+namespace ERPCore.Services;
+
+public sealed class SalesPromotionSuggestionService : ISalesPromotionSuggestionService
+{
+    private const decimal FreeIssueThreshold = 10m;
+
+    private readonly IRepository<SalesSlip> _slips;
+    private readonly IRepository<Item> _items;
+
+    public SalesPromotionSuggestionService(IRepository<SalesSlip> slips, IRepository<Item> items)
+    {
+        _slips = slips;
+        _items = items;
+    }
+
+    public async Task<SalesFreeIssueSuggestionDto?> GetFreeIssueSuggestionsAsync(int salesSlipId, CancellationToken ct = default)
+    {
+        var slip = await _slips.Query().AsNoTracking().Include(x => x.Lines)
+            .FirstOrDefaultAsync(x => x.SalesSlipId == salesSlipId, ct);
+
+        if (slip is null) return null;
+
+        var itemIds = slip.Lines.Select(x => x.ItemId).Distinct().ToList();
+        var candidateItems = await _items.Query().AsNoTracking()
+            .Where(x => itemIds.Contains(x.ItemId) && x.Status == EntityStatus.Active)
+            .ToListAsync(ct);
+
+        var byItemId = candidateItems.ToDictionary(x => x.ItemId);
+        var suggestions = new List<SalesFreeIssueSuggestionLineDto>();
+
+        foreach (var line in slip.Lines.Where(x => x.Qty >= FreeIssueThreshold))
+        {
+            if (!byItemId.TryGetValue(line.ItemId, out var item)) continue;
+
+            var freeQty = Math.Floor(line.Qty / FreeIssueThreshold);
+            if (freeQty <= 0m) continue;
+
+            var rewardOptions = new List<SalesFreeIssueRewardOptionDto>
+            {
+                new(item.ItemId, item.Sku, item.Name, item.SalePrice)
+            };
+
+            var alternates = await _items.Query().AsNoTracking()
+                .Where(x => x.Status == EntityStatus.Active && x.CategoryId == item.CategoryId && x.ItemId != item.ItemId)
+                .OrderBy(x => x.Name)
+                .Take(3)
+                .Select(x => new SalesFreeIssueRewardOptionDto(x.ItemId, x.Sku, x.Name, x.SalePrice))
+                .ToListAsync(ct);
+
+            rewardOptions.AddRange(alternates.Where(x => rewardOptions.All(r => r.ItemId != x.ItemId)));
+
+            suggestions.Add(new SalesFreeIssueSuggestionLineDto(
+                line.SalesSlipLineId,
+                item.ItemId,
+                item.Sku,
+                item.Name,
+                line.Qty,
+                freeQty,
+                FreeIssueThreshold,
+                rewardOptions));
+        }
+
+        return suggestions.Count == 0
+            ? new SalesFreeIssueSuggestionDto(slip.SalesSlipId, slip.SlipNo, slip.SlipDate, Array.Empty<SalesFreeIssueSuggestionLineDto>())
+            : new SalesFreeIssueSuggestionDto(slip.SalesSlipId, slip.SlipNo, slip.SlipDate, suggestions);
+    }
+}
\ No newline at end of file
diff --git a/Backend/ERPCore/Services/SalesReportService.cs b/Backend/ERPCore/Services/SalesReportService.cs
new file mode 100644
index 0000000..e931fba
--- /dev/null
+++ b/Backend/ERPCore/Services/SalesReportService.cs
@@ -0,0 +1,362 @@
+using ERPCore.Domain.Entities;
+using ERPCore.Domain.Enums;
+using ERPCore.Dtos.Sales;
+using ERPCore.Repositories.Interfaces;
+using ERPCore.Services.Interfaces;
+using ERPCore.System.Errors;
+using Microsoft.EntityFrameworkCore;
+
+namespace ERPCore.Services;
+
+public sealed class SalesReportService : ISalesReportService
+{
+    private static readonly SalesReportDefinitionDto[] ReportDefinitions =
+    [
+        new("daily-summary", "Daily Summary", "Aggregated sales by day across posted invoices and slips.", ["from", "to"]),
+        new("item-summary", "Item Summary", "Aggregated sales by item across posted invoices and slips.", ["from", "to", "itemId", "warehouseId"]),
+        new("customer-summary", "Customer Summary", "Aggregated sales by customer across posted invoices and slips.", ["from", "to", "customerId"]),
+        new("warehouse-summary", "Warehouse Summary", "Aggregated sales by warehouse across posted invoices and slips.", ["from", "to", "warehouseId"]),
+        new("discount-summary", "Discount Summary", "Documents with discounts applied.", ["from", "to"]),
+        new("free-issue-summary", "Free Issue Summary", "Lines with free quantities issued.", ["from", "to"])
+    ];
+
+    private readonly IRepository<SalesInvoice> _invoices;
+    private readonly IRepository<SalesSlip> _slips;
+
+    public SalesReportService(IRepository<SalesInvoice> invoices, IRepository<SalesSlip> slips)
+    {
+        _invoices = invoices;
+        _slips = slips;
+    }
+
+    public IReadOnlyList<SalesReportDefinitionDto> ListReports() => ReportDefinitions;
+
+    public SalesReportDefinitionDto? GetReport(string reportId)
+    {
+        var normalized = reportId.Trim().ToLowerInvariant();
+        return ReportDefinitions.FirstOrDefault(r => r.Id == normalized);
+    }
+
+    public async Task<IReadOnlyList<object>> QueryAsync(string reportType, DateOnly from, DateOnly to, int? itemId, int? customerId, int? warehouseId, CancellationToken ct = default)
+    {
+        var normalized = reportType.Trim().ToLowerInvariant();
+        ValidateFilters(normalized, itemId, customerId, warehouseId);
+
+        return normalized switch
+        {
+            "daily" or "daily-summary" => (await DailySummaryAsync(from, to, ct)).Cast<object>().ToList(),
+            "item" or "item-summary" or "item-wise" => (await ItemSummaryAsync(from, to, itemId, warehouseId, ct)).Cast<object>().ToList(),
+            "customer" or "customer-summary" or "customer-wise" => (await CustomerSummaryAsync(from, to, customerId, ct)).Cast<object>().ToList(),
+            "warehouse" or "warehouse-summary" or "warehouse-wise" => (await WarehouseSummaryAsync(from, to, warehouseId, ct)).Cast<object>().ToList(),
+            "discount" or "discount-summary" => (await DiscountSummaryAsync(from, to, ct)).Cast<object>().ToList(),
+            "free-issue" or "free-issue-summary" => (await FreeIssueSummaryAsync(from, to, ct)).Cast<object>().ToList(),
+            _ => throw new DomainException("INVALID_REPORT_TYPE", $"Unsupported sales report type '{reportType}'.", 400)
+        };
+    }
+
+    private static void ValidateFilters(string reportType, int? itemId, int? customerId, int? warehouseId)
+    {
+        var allowed = reportType switch
+        {
+            "daily" or "daily-summary" => new FilterSet(false, false, false),
+            "item" or "item-summary" or "item-wise" => new FilterSet(true, false, true),
+            "customer" or "customer-summary" or "customer-wise" => new FilterSet(false, true, false),
+            "warehouse" or "warehouse-summary" or "warehouse-wise" => new FilterSet(false, false, true),
+            "discount" or "discount-summary" => new FilterSet(false, false, false),
+            "free-issue" or "free-issue-summary" => new FilterSet(false, false, false),
+            _ => throw new DomainException("INVALID_REPORT_TYPE", $"Unsupported sales report type '{reportType}'.", 400)
+        };
+
+        if (!allowed.Item && itemId is not null)
+            throw new DomainException("INVALID_REPORT_FILTER", $"Filter 'itemId' is not valid for report type '{reportType}'.", 400);
+        if (!allowed.Customer && customerId is not null)
+            throw new DomainException("INVALID_REPORT_FILTER", $"Filter 'customerId' is not valid for report type '{reportType}'.", 400);
+        if (!allowed.Warehouse && warehouseId is not null)
+            throw new DomainException("INVALID_REPORT_FILTER", $"Filter 'warehouseId' is not valid for report type '{reportType}'.", 400);
+    }
+
+    private readonly record struct FilterSet(bool Item, bool Customer, bool Warehouse);
+
+    public async Task<IReadOnlyList<SalesDailySummaryRowDto>> DailySummaryAsync(DateOnly from, DateOnly to, CancellationToken ct = default)
+    {
+        var invoiceRows = await _invoices.Query().AsNoTracking()
+            .Where(x => x.Status == SalesInvoiceStatus.Posted && x.InvoiceDate >= from.ToDateTime(TimeOnly.MinValue) && x.InvoiceDate < to.AddDays(1).ToDateTime(TimeOnly.MinValue))
+            .GroupBy(x => DateOnly.FromDateTime(x.InvoiceDate))
+            .Select(g => new
+            {
+                Date = g.Key,
+                InvoiceCount = g.Count(),
+                SlipCount = 0,
+                InvoiceSubtotal = g.Sum(x => x.Subtotal),
+                SlipSubtotal = 0m,
+                DiscountTotal = g.Sum(x => x.DiscountTotal),
+                FreeQtyTotal = g.Sum(x => x.Lines.Sum(l => l.FreeQty)),
+                TaxTotal = g.Sum(x => x.TaxTotal),
+                GrandTotal = g.Sum(x => x.GrandTotal)
+            })
+            .ToListAsync(ct);
+
+        var slipRows = await _slips.Query().AsNoTracking()
+            .Where(x => x.Status == SalesSlipStatus.Posted && x.SlipDate >= from.ToDateTime(TimeOnly.MinValue) && x.SlipDate < to.AddDays(1).ToDateTime(TimeOnly.MinValue))
+            .GroupBy(x => DateOnly.FromDateTime(x.SlipDate))
+            .Select(g => new
+            {
+                Date = g.Key,
+                InvoiceCount = 0,
+                SlipCount = g.Count(),
+                InvoiceSubtotal = 0m,
+                SlipSubtotal = g.Sum(x => x.Subtotal),
+                DiscountTotal = g.Sum(x => x.DiscountTotal),
+                FreeQtyTotal = g.Sum(x => x.Lines.Sum(l => l.FreeQty)),
+                TaxTotal = g.Sum(x => x.TaxTotal),
+                GrandTotal = g.Sum(x => x.GrandTotal)
+            })
+            .ToListAsync(ct);
+
+        return invoiceRows.Concat(slipRows)
+            .GroupBy(x => x.Date)
+            .OrderBy(x => x.Key)
+            .Select(g => new SalesDailySummaryRowDto(
+                g.Key,
+                g.Sum(x => x.InvoiceCount),
+                g.Sum(x => x.SlipCount),
+                g.Sum(x => x.InvoiceSubtotal),
+                g.Sum(x => x.SlipSubtotal),
+                g.Sum(x => x.DiscountTotal),
+                g.Sum(x => x.FreeQtyTotal),
+                g.Sum(x => x.TaxTotal),
+                g.Sum(x => x.GrandTotal)))
+            .ToList();
+    }
+
+    public async Task<IReadOnlyList<SalesItemSummaryRowDto>> ItemSummaryAsync(DateOnly from, DateOnly to, int? itemId, int? warehouseId, CancellationToken ct = default)
+    {
+        var invoiceRows = await _invoices.Query().AsNoTracking()
+            .Where(x => x.Status == SalesInvoiceStatus.Posted && x.InvoiceDate >= from.ToDateTime(TimeOnly.MinValue) && x.InvoiceDate < to.AddDays(1).ToDateTime(TimeOnly.MinValue))
+            .SelectMany(x => x.Lines.Select(l => new
+            {
+                l.ItemId,
+                l.Description,
+                l.Qty,
+                l.FreeQty,
+                Gross = l.Qty * l.UnitPrice,
+                l.DiscountAmount,
+                l.TaxAmount,
+                l.LineTotal,
+                x.WarehouseId
+            }))
+            .ToListAsync(ct);
+
+        if (warehouseId is not null)
+            invoiceRows = invoiceRows.Where(x => x.WarehouseId == warehouseId).ToList();
+        if (itemId is not null)
+            invoiceRows = invoiceRows.Where(x => x.ItemId == itemId).ToList();
+
+        var slipRows = await _slips.Query().AsNoTracking()
+            .Where(x => x.Status == SalesSlipStatus.Posted && x.SlipDate >= from.ToDateTime(TimeOnly.MinValue) && x.SlipDate < to.AddDays(1).ToDateTime(TimeOnly.MinValue))
+            .SelectMany(x => x.Lines.Select(l => new
+            {
+                l.ItemId,
+                l.Description,
+                l.Qty,
+                l.FreeQty,
+                Gross = l.Qty * l.UnitPrice,
+                l.DiscountAmount,
+                l.TaxAmount,
+                l.LineTotal,
+                x.WarehouseId
+            }))
+            .ToListAsync(ct);
+
+        if (warehouseId is not null)
+            slipRows = slipRows.Where(x => x.WarehouseId == warehouseId).ToList();
+        if (itemId is not null)
+            slipRows = slipRows.Where(x => x.ItemId == itemId).ToList();
+
+        return invoiceRows.Concat(slipRows)
+            .GroupBy(x => new { x.ItemId, x.Description })
+            .OrderByDescending(g => g.Sum(x => x.LineTotal) + g.Sum(x => x.TaxAmount))
+            .Select(g => new SalesItemSummaryRowDto(
+                g.Key.ItemId,
+                g.Key.Description,
+                g.Sum(x => x.Qty),
+                g.Sum(x => x.FreeQty),
+                g.Sum(x => x.Gross),
+                g.Sum(x => x.DiscountAmount),
+                g.Sum(x => x.TaxAmount),
+                g.Sum(x => x.LineTotal) + g.Sum(x => x.TaxAmount)))
+            .ToList();
+    }
+
+    public async Task<IReadOnlyList<SalesCustomerSummaryRowDto>> CustomerSummaryAsync(DateOnly from, DateOnly to, int? customerId, CancellationToken ct = default)
+    {
+        var invoiceQuery = _invoices.Query().AsNoTracking()
+            .Where(x => x.Status == SalesInvoiceStatus.Posted && x.InvoiceDate >= from.ToDateTime(TimeOnly.MinValue) && x.InvoiceDate < to.AddDays(1).ToDateTime(TimeOnly.MinValue));
+        if (customerId is not null) invoiceQuery = invoiceQuery.Where(x => x.CustomerId == customerId);
+
+        var slipQuery = _slips.Query().AsNoTracking()
+            .Where(x => x.Status == SalesSlipStatus.Posted && x.SlipDate >= from.ToDateTime(TimeOnly.MinValue) && x.SlipDate < to.AddDays(1).ToDateTime(TimeOnly.MinValue));
+        if (customerId is not null) slipQuery = slipQuery.Where(x => x.CustomerId == customerId);
+
+        var invoiceRows = await invoiceQuery
+            .GroupBy(x => new { x.CustomerId, x.CustomerSnapshotName })
+            .Select(g => new
+            {
+                g.Key.CustomerId,
+                CustomerName = g.Key.CustomerSnapshotName,
+                InvoiceCount = g.Count(),
+                SlipCount = 0,
+                SoldQty = g.Sum(x => x.Lines.Sum(l => l.Qty)),
+                FreeQty = g.Sum(x => x.Lines.Sum(l => l.FreeQty)),
+                GrossAmount = g.Sum(x => x.Subtotal),
+                DiscountTotal = g.Sum(x => x.DiscountTotal),
+                TaxTotal = g.Sum(x => x.TaxTotal),
+                NetAmount = g.Sum(x => x.GrandTotal)
+            })
+            .ToListAsync(ct);
+
+        var slipRows = await slipQuery
+            .GroupBy(x => new { x.CustomerId, x.CustomerSnapshotName })
+            .Select(g => new
+            {
+                g.Key.CustomerId,
+                CustomerName = g.Key.CustomerSnapshotName,
+                InvoiceCount = 0,
+                SlipCount = g.Count(),
+                SoldQty = g.Sum(x => x.Lines.Sum(l => l.Qty)),
+                FreeQty = g.Sum(x => x.Lines.Sum(l => l.FreeQty)),
+                GrossAmount = g.Sum(x => x.Subtotal),
+                DiscountTotal = g.Sum(x => x.DiscountTotal),
+                TaxTotal = g.Sum(x => x.TaxTotal),
+                NetAmount = g.Sum(x => x.GrandTotal)
+            })
+            .ToListAsync(ct);
+
+        return invoiceRows.Concat(slipRows)
+            .GroupBy(x => new { x.CustomerId, x.CustomerName })
+            .OrderByDescending(g => g.Sum(x => x.NetAmount))
+            .Select(g => new SalesCustomerSummaryRowDto(
+                g.Key.CustomerId,
+                g.Key.CustomerName,
+                g.Sum(x => x.InvoiceCount),
+                g.Sum(x => x.SlipCount),
+                g.Sum(x => x.SoldQty),
+                g.Sum(x => x.FreeQty),
+                g.Sum(x => x.GrossAmount),
+                g.Sum(x => x.DiscountTotal),
+                g.Sum(x => x.TaxTotal),
+                g.Sum(x => x.NetAmount)))
+            .ToList();
+    }
+
+    public async Task<IReadOnlyList<SalesWarehouseSummaryRowDto>> WarehouseSummaryAsync(DateOnly from, DateOnly to, int? warehouseId, CancellationToken ct = default)
+    {
+        var invoiceQuery = _invoices.Query().AsNoTracking()
+            .Where(x => x.Status == SalesInvoiceStatus.Posted && x.InvoiceDate >= from.ToDateTime(TimeOnly.MinValue) && x.InvoiceDate < to.AddDays(1).ToDateTime(TimeOnly.MinValue));
+        if (warehouseId is not null) invoiceQuery = invoiceQuery.Where(x => x.WarehouseId == warehouseId);
+
+        var slipQuery = _slips.Query().AsNoTracking()
+            .Where(x => x.Status == SalesSlipStatus.Posted && x.SlipDate >= from.ToDateTime(TimeOnly.MinValue) && x.SlipDate < to.AddDays(1).ToDateTime(TimeOnly.MinValue));
+        if (warehouseId is not null) slipQuery = slipQuery.Where(x => x.WarehouseId == warehouseId);
+
+        var invoiceRows = await invoiceQuery
+            .GroupBy(x => new { x.WarehouseId, x.Warehouse!.Name })
+            .Select(g => new
+            {
+                g.Key.WarehouseId,
+                WarehouseName = g.Key.Name,
+                InvoiceCount = g.Count(),
+                SlipCount = 0,
+                SoldQty = g.Sum(x => x.Lines.Sum(l => l.Qty)),
+                FreeQty = g.Sum(x => x.Lines.Sum(l => l.FreeQty)),
+                GrossAmount = g.Sum(x => x.Subtotal),
+                DiscountTotal = g.Sum(x => x.DiscountTotal),
+                TaxTotal = g.Sum(x => x.TaxTotal),
+                NetAmount = g.Sum(x => x.GrandTotal)
+            })
+            .ToListAsync(ct);
+
+        var slipRows = await slipQuery
+            .GroupBy(x => new { x.WarehouseId, x.Warehouse!.Name })
+            .Select(g => new
+            {
+                g.Key.WarehouseId,
+                WarehouseName = g.Key.Name,
+                InvoiceCount = 0,
+                SlipCount = g.Count(),
+                SoldQty = g.Sum(x => x.Lines.Sum(l => l.Qty)),
+                FreeQty = g.Sum(x => x.Lines.Sum(l => l.FreeQty)),
+                GrossAmount = g.Sum(x => x.Subtotal),
+                DiscountTotal = g.Sum(x => x.DiscountTotal),
+                TaxTotal = g.Sum(x => x.TaxTotal),
+                NetAmount = g.Sum(x => x.GrandTotal)
+            })
+            .ToListAsync(ct);
+
+        return invoiceRows.Concat(slipRows)
+            .GroupBy(x => new { x.WarehouseId, x.WarehouseName })
+            .OrderByDescending(g => g.Sum(x => x.NetAmount))
+            .Select(g => new SalesWarehouseSummaryRowDto(
+                g.Key.WarehouseId,
+                g.Key.WarehouseName,
+                g.Sum(x => x.InvoiceCount),
+                g.Sum(x => x.SlipCount),
+                g.Sum(x => x.SoldQty),
+                g.Sum(x => x.FreeQty),
+                g.Sum(x => x.GrossAmount),
+                g.Sum(x => x.DiscountTotal),
+                g.Sum(x => x.TaxTotal),
+                g.Sum(x => x.NetAmount)))
+            .ToList();
+    }
+
+    public async Task<IReadOnlyList<SalesDiscountSummaryRowDto>> DiscountSummaryAsync(DateOnly from, DateOnly to, CancellationToken ct = default)
+    {
+        var invoices = await _invoices.Query().AsNoTracking()
+            .Where(x => x.Status == SalesInvoiceStatus.Posted && x.InvoiceDate >= from.ToDateTime(TimeOnly.MinValue) && x.InvoiceDate < to.AddDays(1).ToDateTime(TimeOnly.MinValue) && x.DiscountTotal > 0m)
+            .Select(x => new SalesDiscountSummaryRowDto("Invoice", x.InvoiceNo, x.InvoiceDate, x.CustomerSnapshotName, x.Subtotal, x.DiscountTotal, x.TaxTotal, x.GrandTotal))
+            .ToListAsync(ct);
+
+        var slips = await _slips.Query().AsNoTracking()
+            .Where(x => x.Status == SalesSlipStatus.Posted && x.SlipDate >= from.ToDateTime(TimeOnly.MinValue) && x.SlipDate < to.AddDays(1).ToDateTime(TimeOnly.MinValue) && x.DiscountTotal > 0m)
+            .Select(x => new SalesDiscountSummaryRowDto("Slip", x.SlipNo, x.SlipDate, x.CustomerSnapshotName, x.Subtotal, x.DiscountTotal, x.TaxTotal, x.GrandTotal))
+            .ToListAsync(ct);
+
+        return invoices.Concat(slips).OrderByDescending(x => x.DiscountTotal).ToList();
+    }
+
+    public async Task<IReadOnlyList<SalesFreeIssueSummaryRowDto>> FreeIssueSummaryAsync(DateOnly from, DateOnly to, CancellationToken ct = default)
+    {
+        var invoiceRows = await _invoices.Query().AsNoTracking()
+            .Where(x => x.Status == SalesInvoiceStatus.Posted && x.InvoiceDate >= from.ToDateTime(TimeOnly.MinValue) && x.InvoiceDate < to.AddDays(1).ToDateTime(TimeOnly.MinValue))
+            .SelectMany(x => x.Lines.Where(l => l.FreeQty > 0m).Select(l => new SalesFreeIssueSummaryRowDto(
+                "Invoice",
+                x.InvoiceNo,
+                x.InvoiceDate,
+                x.CustomerSnapshotName,
+                l.ItemId,
+                l.Description,
+                l.FreeQty,
+                l.FreeQty * l.UnitPrice,
+                l.WarehouseId,
+                x.Warehouse!.Name)))
+            .ToListAsync(ct);
+
+        var slipRows = await _slips.Query().AsNoTracking()
+            .Where(x => x.Status == SalesSlipStatus.Posted && x.SlipDate >= from.ToDateTime(TimeOnly.MinValue) && x.SlipDate < to.AddDays(1).ToDateTime(TimeOnly.MinValue))
+            .SelectMany(x => x.Lines.Where(l => l.FreeQty > 0m).Select(l => new SalesFreeIssueSummaryRowDto(
+                "Slip",
+                x.SlipNo,
+                x.SlipDate,
+                x.CustomerSnapshotName,
+                l.ItemId,
+                l.Description,
+                l.FreeQty,
+                l.FreeQty * l.UnitPrice,
+                l.WarehouseId,
+                x.Warehouse!.Name)))
+            .ToListAsync(ct);
+
+        return invoiceRows.Concat(slipRows).OrderByDescending(x => x.FreeQty).ToList();
+    }
+}
diff --git a/Backend/ERPCore/Services/SalesSlipService.cs b/Backend/ERPCore/Services/SalesSlipService.cs
new file mode 100644
index 0000000..9e8074d
--- /dev/null
+++ b/Backend/ERPCore/Services/SalesSlipService.cs
@@ -0,0 +1,270 @@
+using ERPCore.Common.Http;
+using ERPCore.Domain;
+using ERPCore.Domain.Entities;
+using ERPCore.Domain.Enums;
+using ERPCore.Dtos.Common;
+using ERPCore.Dtos.Sales;
+using ERPCore.Infra.Auth;
+using ERPCore.Infra.UoW;
+using ERPCore.Repositories.Interfaces;
+using ERPCore.Services.Interfaces;
+using ERPCore.Services.Stock;
+using ERPCore.System.Errors;
+using Microsoft.EntityFrameworkCore;
+
+namespace ERPCore.Services;
+
+public sealed class SalesSlipService : ISalesSlipService
+{
+    private readonly IRepository<SalesSlip> _slips;
+    private readonly IRepository<Customer> _customers;
+    private readonly IRepository<Item> _items;
+    private readonly IRepository<Uom> _uoms;
+    private readonly IRepository<Warehouse> _warehouses;
+    private readonly IRepository<User> _users;
+    private readonly ISalesDomainService _sales;
+    private readonly ISalesPostingService _posting;
+    private readonly ISalesMappingService _mapping;
+    private readonly ISalesDocumentWorkflowService _workflow;
+    private readonly ICurrentUser _currentUser;
+    private readonly INumberSequenceService _numbers;
+    private readonly IUnitOfWork _uow;
+
+    public SalesSlipService(
+        IRepository<SalesSlip> slips, IRepository<Customer> customers, IRepository<Item> items,
+        IRepository<Uom> uoms, IRepository<Warehouse> warehouses, IRepository<User> users, ISalesDomainService sales, ISalesPostingService posting, ISalesMappingService mapping,
+        ISalesDocumentWorkflowService workflow,
+        ICurrentUser currentUser, INumberSequenceService numbers, IUnitOfWork uow)
+    {
+        _slips = slips;
+        _customers = customers;
+        _items = items;
+        _uoms = uoms;
+        _warehouses = warehouses;
+        _users = users;
+        _sales = sales;
+        _posting = posting;
+        _mapping = mapping;
+        _workflow = workflow;
+        _currentUser = currentUser;
+        _numbers = numbers;
+        _uow = uow;
+    }
+
+    public async Task<PagedResponse<SalesSlipSummaryDto>> ListAsync(PageQuery query, SalesSlipStatus? status, int? customerId, int? warehouseId, CancellationToken ct = default)
+    {
+        IQueryable<SalesSlip> q = _slips.Query().AsNoTracking().Include(x => x.Lines);
+        if (!string.IsNullOrWhiteSpace(query.Q))
+        {
+            var term = query.Q.Trim();
+            q = q.Where(x => EF.Functions.ILike(x.SlipNo, $"%{term}%") || EF.Functions.ILike(x.CustomerSnapshotName, $"%{term}%"));
+        }
+        if (status is not null) q = q.Where(x => x.Status == status);
+        if (customerId is not null) q = q.Where(x => x.CustomerId == customerId);
+        if (warehouseId is not null) q = q.Where(x => x.WarehouseId == warehouseId);
+
+        var total = await q.CountAsync(ct);
+        var rows = await q.OrderByDescending(x => x.SalesSlipId).Skip(query.Skip).Take(query.PageSize).ToListAsync(ct);
+        return PagedResponse<SalesSlipSummaryDto>.Create(rows.Select(MapSummary).ToList(), query.Page, query.PageSize, total);
+    }
+
+    public async Task<ETagged<SalesSlipDto>?> GetAsync(int salesSlipId, CancellationToken ct = default)
+    {
+        var slip = await _slips.Query().AsNoTracking().Include(x => x.Lines)
+            .FirstOrDefaultAsync(x => x.SalesSlipId == salesSlipId, ct);
+        return slip is null ? null : new ETagged<SalesSlipDto>(_mapping.MapSlip(slip), slip.RowVersion);
+    }
+
+    public async Task<PagedResponse<FreeIssueSummaryDto>> ListFreeIssuesAsync(PageQuery query, SalesSlipStatus? status, int? customerId, int? warehouseId, CancellationToken ct = default)
+    {
+        IQueryable<SalesSlip> q = _slips.Query().AsNoTracking().Include(x => x.Lines);
+        q = q.Where(x => x.Lines.Any(l => l.IsFreeIssue || l.FreeQty > 0m));
+        if (!string.IsNullOrWhiteSpace(query.Q))
+        {
+            var term = query.Q.Trim();
+            q = q.Where(x => EF.Functions.ILike(x.SlipNo, $"%{term}%") || EF.Functions.ILike(x.CustomerSnapshotName, $"%{term}%"));
+        }
+        if (status is not null) q = q.Where(x => x.Status == status);
+        if (customerId is not null) q = q.Where(x => x.CustomerId == customerId);
+        if (warehouseId is not null) q = q.Where(x => x.WarehouseId == warehouseId);
+
+        var total = await q.CountAsync(ct);
+        var rows = await q.OrderByDescending(x => x.SalesSlipId).Skip(query.Skip).Take(query.PageSize).ToListAsync(ct);
+        return PagedResponse<FreeIssueSummaryDto>.Create(rows.Select(MapFreeIssueSummary).ToList(), query.Page, query.PageSize, total);
+    }
+
+    public async Task<ETagged<FreeIssueDto>?> GetFreeIssueAsync(int salesSlipId, CancellationToken ct = default)
+    {
+        var slip = await _slips.Query().AsNoTracking().Include(x => x.Lines)
+            .FirstOrDefaultAsync(x => x.SalesSlipId == salesSlipId, ct);
+        return slip is null ? null : new ETagged<FreeIssueDto>(MapFreeIssue(slip), slip.RowVersion);
+    }
+
+    public Task<SalesSlipPostingCheckDto> CheckPostingAsync(int salesSlipId, CancellationToken ct = default)
+        => _posting.CheckSlipAsync(salesSlipId, ct);
+
+    public async Task<ETagged<SalesSlipDto>> CreateAsync(CreateSalesSlipRequest request, CancellationToken ct = default)
+    {
+        await _sales.ValidateSalesHeaderAsync(request.CustomerId, request.WarehouseId, request.CashierUserId, true, ct);
+
+        var slip = new SalesSlip
+        {
+            SlipNo = await _numbers.NextAsync(DocumentTypes.SalesSlip, ct),
+            SlipDate = DateTime.UtcNow,
+            CustomerId = request.CustomerId,
+            WarehouseId = request.WarehouseId,
+            CashierUserId = request.CashierUserId,
+            Status = SalesSlipStatus.Draft,
+            CreatedAt = DateTime.UtcNow
+        };
+        slip.CustomerSnapshotName = await _customers.Query().Where(x => x.CustomerId == request.CustomerId).Select(x => x.DisplayName ?? x.Name).FirstAsync(ct);
+        slip.Lines = await BuildLinesAsync(request.WarehouseId, request.Lines, ct);
+        Recalculate(slip);
+
+        await _slips.AddAsync(slip, ct);
+        await _uow.SaveChangesAsync(ct);
+        return new ETagged<SalesSlipDto>(_mapping.MapSlip(slip), slip.RowVersion);
+    }
+
+    public async Task<ETagged<SalesSlipDto>> UpdateAsync(int salesSlipId, UpdateSalesSlipRequest request, uint expectedRowVersion, CancellationToken ct = default)
+    {
+        var slip = await _workflow.LoadEditableSlipAsync(salesSlipId, expectedRowVersion, ct);
+
+        await _sales.ValidateSalesHeaderAsync(request.CustomerId, request.WarehouseId, request.CashierUserId, true, ct);
+        slip.CustomerId = request.CustomerId;
+        slip.WarehouseId = request.WarehouseId;
+        slip.CashierUserId = request.CashierUserId;
+        slip.CustomerSnapshotName = await _customers.Query().Where(x => x.CustomerId == request.CustomerId).Select(x => x.DisplayName ?? x.Name).FirstAsync(ct);
+        slip.Lines.Clear();
+        foreach (var line in await BuildLinesAsync(request.WarehouseId, request.Lines, ct)) slip.Lines.Add(line);
+        Recalculate(slip);
+        slip.UpdatedAt = DateTime.UtcNow;
+        await _uow.SaveChangesAsync(ct);
+        return new ETagged<SalesSlipDto>(_mapping.MapSlip(slip), slip.RowVersion);
+    }
+
+    public async Task<SalesSlipDto> PostAsync(int salesSlipId, CancellationToken ct = default)
+        {
+            await _posting.PostSlipAsync(salesSlipId, ct);
+            var slip = await _slips.Query().AsNoTracking().Include(x => x.Lines)
+                .FirstAsync(x => x.SalesSlipId == salesSlipId, ct);
+            return _mapping.MapSlip(slip);
+        }
+
+    public async Task<SalesSlipDto> CancelAsync(int salesSlipId, CancellationToken ct = default)
+    {
+        var slip = await _slips.Query().Include(x => x.Lines).FirstOrDefaultAsync(x => x.SalesSlipId == salesSlipId, ct)
+            ?? throw new NotFoundException($"Sales slip {salesSlipId} was not found.");
+        if (slip.Status != SalesSlipStatus.Draft)
+            throw new ConflictException($"Sales slip {salesSlipId} is {slip.Status} and cannot be cancelled.");
+        slip.Status = SalesSlipStatus.Cancelled;
+        slip.UpdatedAt = DateTime.UtcNow;
+        await _uow.SaveChangesAsync(ct);
+        return _mapping.MapSlip(slip);
+    }
+
+    private async Task<List<SalesSlipLine>> BuildLinesAsync(int headerWarehouseId, List<CreateSalesSlipLineRequest> requests, CancellationToken ct)
+    {
+        var lines = new List<SalesSlipLine>();
+        foreach (var r in requests)
+        {
+            var item = await _items.Query().AsNoTracking().FirstAsync(x => x.ItemId == r.ItemId, ct);
+            await _sales.ValidateSalesLineAsync(headerWarehouseId, r.ItemId, r.UomId, r.WarehouseId, r.Qty, r.FreeQty, r.ParentLineId, ct);
+            var resolved = await _sales.ResolveLinePriceAsync(r.ItemId, r.WarehouseId, r.UnitPrice, r.AllowManualPriceOverride, ct);
+            var unitPrice = resolved.UnitPrice;
+            var priceSource = resolved.PriceSource;
+
+            var calc = _sales.ComputeLine(r.Qty, r.FreeQty, unitPrice, r.DiscountMode, r.DiscountPct, r.DiscountValue, r.DiscountAmount, r.TaxPct, r.IsFreeIssue);
+
+            lines.Add(new SalesSlipLine
+            {
+                ItemId = r.ItemId,
+                Description = item.Name,
+                Qty = r.Qty,
+                FreeQty = r.FreeQty,
+                UomId = r.UomId,
+                WarehouseId = r.WarehouseId,
+                UnitPrice = unitPrice,
+                BaseCost = unitPrice,
+                PriceSource = priceSource,
+                DiscountMode = r.DiscountMode,
+                DiscountPct = r.DiscountPct,
+                DiscountAmount = calc.DiscountTotal,
+                NetUnitPrice = calc.NetUnitPrice,
+                LineTotal = calc.LineTotal,
+                TaxPct = r.TaxPct,
+                TaxAmount = calc.TaxAmount,
+                IsFreeIssue = r.IsFreeIssue,
+                ParentLineId = r.ParentLineId
+            });
+        }
+        return lines;
+    }
+
+    private static void Recalculate(SalesSlip slip)
+    {
+        slip.Subtotal = slip.Lines.Sum(x => x.Qty * x.UnitPrice);
+        slip.DiscountTotal = slip.Lines.Sum(x => x.DiscountAmount);
+        slip.TaxTotal = slip.Lines.Sum(x => x.TaxAmount);
+        slip.GrandTotal = slip.Lines.Sum(x => x.LineTotal) + slip.TaxTotal;
+        slip.PaidAmount = 0m;
+        slip.BalanceAmount = slip.GrandTotal - slip.PaidAmount;
+    }
+
+    private SalesSlipSummaryDto MapSummary(SalesSlip x) => new(
+        x.SalesSlipId, x.SlipNo, x.SlipDate, x.CustomerId, x.CustomerSnapshotName, x.WarehouseId, x.Status,
+        _mapping.MapSlipTotals(x), x.CreatedAt);
+
+    private FreeIssueSummaryDto MapFreeIssueSummary(SalesSlip x)
+    {
+        var line = x.Lines.FirstOrDefault();
+        var item = line is null ? null : _items.Query().AsNoTracking()
+            .Where(i => i.ItemId == line.ItemId)
+            .Select(i => new { i.ItemId, i.Sku, i.Name, i.BaseUomId })
+            .FirstOrDefault();
+        var uom = line is null ? null : _uoms.Query().AsNoTracking()
+            .Where(u => u.UomId == line.UomId)
+            .Select(u => new { u.UomId, u.Name })
+            .FirstOrDefault();
+        var warehouse = _warehouses.Query().AsNoTracking()
+            .Where(w => w.WarehouseId == x.WarehouseId)
+            .Select(w => new { w.WarehouseId, w.Name })
+            .FirstOrDefault();
+        return new FreeIssueSummaryDto(
+            x.SalesSlipId,
+            x.SlipNo,
+            x.Status,
+            x.CreatedAt,
+            x.WarehouseId,
+            warehouse?.Name ?? $"Warehouse {x.WarehouseId}",
+            line?.ItemId ?? 0,
+            item?.Sku ?? $"SKU-{line?.ItemId ?? 0}",
+            item?.Name ?? line?.Description ?? "—",
+            line?.UomId ?? 0,
+            uom?.Name ?? $"UOM {line?.UomId ?? 0}",
+            line?.Qty ?? 0m,
+            line?.FreeQty ?? 0m,
+            line is null ? "No line" : $"Buy {line.Qty} Get {line.FreeQty}");
+    }
+
+    private FreeIssueDto MapFreeIssue(SalesSlip x)
+    {
+        var summary = MapFreeIssueSummary(x);
+        return new FreeIssueDto(
+            x.SalesSlipId,
+            x.SlipNo,
+            x.SlipDate,
+            x.Status,
+            x.CustomerId,
+            x.CustomerSnapshotName,
+            x.WarehouseId,
+            summary.WarehouseName,
+            x.CashierUserId,
+            x.CreatedAt,
+            x.UpdatedAt,
+            summary,
+            x.Lines.Select(l => new SalesSlipLineDto(l.SalesSlipLineId, l.ItemId, l.Description, l.Qty, l.FreeQty, l.UomId, l.WarehouseId, l.UnitPrice, l.BaseCost, l.PriceSource, l.DiscountPct, l.DiscountAmount, l.DiscountMode, l.NetUnitPrice, l.LineTotal, l.TaxPct, l.TaxAmount, l.IsFreeIssue, l.ParentLineId)).ToList());
+    }
+
+    private SalesSlipDto Map(SalesSlip x) => _mapping.MapSlip(x);
+}
diff --git a/Backend/ERPCore/System/Errors/ErrorCodes.cs b/Backend/ERPCore/System/Errors/ErrorCodes.cs
index 903af82..bc439f3 100644
--- a/Backend/ERPCore/System/Errors/ErrorCodes.cs
+++ b/Backend/ERPCore/System/Errors/ErrorCodes.cs
@@ -66,4 +66,7 @@ public static class ErrorCodes
     public const string LeftoverExceedsConsumed = "LEFTOVER_EXCEEDS_CONSUMED";
     public const string RunCostClosed = "RUN_COST_CLOSED";
     public const string RunNotCancellable = "RUN_NOT_CANCELLABLE";
+
+    // General Ledger service proxy (GeneralLedgerController → external GL service, docs/12)
+    public const string GlServiceUnavailable = "GL_SERVICE_UNAVAILABLE";
 }
diff --git a/Backend/ERPCore/appsettings.Development.json b/Backend/ERPCore/appsettings.Development.json
index 28ac658..f09d44e 100644
--- a/Backend/ERPCore/appsettings.Development.json
+++ b/Backend/ERPCore/appsettings.Development.json
@@ -6,7 +6,7 @@
     }
   },
   "ConnectionStrings": {
-    "DefaultConnection": "Host=localhost;Port=5432;Database=ERPCore;Username=postgres;Password=root"
+    "DefaultConnection": "Host=localhost;Port=5432;Database=ERPCoreDev;Username=postgres;Password=root"
   },
   "AuthHex": {
     "BaseUrl": "http://localhost:5011"
diff --git a/Backend/ERPCore/appsettings.json b/Backend/ERPCore/appsettings.json
index ee6e372..9d07a93 100644
--- a/Backend/ERPCore/appsettings.json
+++ b/Backend/ERPCore/appsettings.json
@@ -22,5 +22,9 @@
     "RootPath": "App_Data/hr-documents",
     "MaxSizeBytes": 10485760
   },
+  "GeneralLedgerService": {
+    "BaseUrl": "https://localhost:7024/api/v1/",
+    "ApiKey": "1A5FE0E389C029B1FBCD2A94650CEBF0656083BF06FF48E5E11987040ABA262D"
+  },
   "AllowedHosts": "*"
 }
diff --git a/Backend/PROGRESS.md b/Backend/PROGRESS.md
index f9431cf..f65e8f9 100644
--- a/Backend/PROGRESS.md
+++ b/Backend/PROGRESS.md
@@ -4,6 +4,11 @@ Legend: `[ ]` not started · `[~]` in progress · `[x]` done
 Spec: `docs/10-BACKEND-PHASE1.md` (model + rules) · `docs/11-BACKEND-PHASE1.md` (API)
 Convention: `docs/01-DOC-GUIDE.md §6`. Update this file in the **same commit** as the code. When ticking `[x]`, append a short note + any deviation.
 
+## 8. Sales
+- [x] Sales bootstrap data seeded locally for development: warehouses, UOMs, categories, items, customers, current-year `SI`/`SSL` sequences, plus sample invoice/slip headers and lines. Existing data is preserved.
+- [x] Sales report API consolidated into `GET /api/v1/reports/sales` (catalog), `GET /api/v1/reports/sales/{reportId}` (report metadata), and `POST /api/v1/reports/sales/query` (filtered data). Legacy per-report GET routes removed; invalid report/filter combinations now fail validation.
+- [x] Free-issue CRUD exposed as `api/v1/free-issues` as a thin alias over sales slips. Free issue remains a line-level `IsFreeIssue` / `FreeQty` behavior, not a separate table.
+
 ## 0. Bootstrap
 - [x] Solution + Web API project (`net10.0`), packages restored (00-CORE §5.4)
 - [x] Folder structure per 00-CORE §5.3
@@ -105,6 +110,44 @@ Convention: `docs/01-DOC-GUIDE.md §6`. Update this file in the **same commit**
 - [~] FEFO picking for perishables; block expired / on-hold issue — **issue-block done + verified** (`ONHOLD_NOT_ISSUABLE`, `EXPIRED_BATCH_BLOCKED`; on-hold/expired layers excluded from consume). FEFO *pick ordering* (oldest-expiry first) not yet built.
 - [x] Reason codes (FR-X-04) — `ReasonCode` entity + `GET/POST /reason-codes`; standard set (docs/10 §B.8.3) seeded idempotently at startup (`DataSeeder`). Verified.
 
+## 7. External Integrations
+> **General Ledger service** (separate microservice, own repo/DB) — connected 2026-07-20 as a generic reverse-proxy only; no ERPCore business logic posts to it yet. Full contract + progress detail: `docs/12-GENERAL-LEDGER-INTEGRATION.md`.
+- [~] Generic proxy `GET|POST|PUT /api/v1/gl/{**path}` (`GeneralLedgerController` → `IGeneralLedgerService` → `IGeneralLedgerClient`) — forwards method/path/query/body/content-type verbatim to the GL service with a server-attached `X-Api-Key`; GL's response (status + body) returned unchanged. ErpAccess-door-policy-gated like every other v1 endpoint. Config: `GeneralLedgerService:BaseUrl`/`ApiKey` in `appsettings.json`. Build verified clean; **not yet live-smoke-tested** (no running GL instance this pass).
+- [ ] Internal wiring — ERPCore services (GRN confirm, adjustments, etc.) calling `IGeneralLedgerService` directly to post real journal entries. Deliberately deferred.
+
+> ### 2026-07-20 — RBAC nav seed for the frontend's new "Ledgers" section
+> The `Frontend/PROGRESS.md` §8 "Ledgers" sidebar section (docs/21-GENERAL-LEDGER-FRONTEND.md) needs a matching `NavItem`/`SubNavItem`/`Permission` row for every entry, or the sidebar filters it out for every role regardless of the frontend change (docs/10 C.8, `GET /auth/me`'s `navCodes`). Added via `NavItemConfiguration.cs`/`SubNavItemConfiguration.cs`/`PermissionConfiguration.cs` `HasData`: `NavItem` `ledgers` (id 11), 7 `SubNavItem` rows (ids 9–15, `ledgers.trial-balance` … `ledgers.bank-accounts`), 8 `Permission` rows (ids 19–26) — same one-`Permission`-per-nav-entry convention as every existing nav row. Migration `AddLedgersNavSeed`.
+> **Build note:** a locally running `ERPCore.exe` (PID 29692) held the default `bin/Debug` output locked for the whole session, so `dotnet ef migrations add` twice produced an empty no-op migration off a stale assembly (`--no-build` silently reused pre-edit code) before the real cause was found. Fixed by building to a scratch output directory (unaffected by the lock), copying the fresh `ERPCore.dll` over the locked `bin/Debug` copy (the running process only locks the `.exe`, not the `.dll`), then re-scaffolding — the resulting migration's `Up`/`Down` were verified by inspection against the identical, already-applied `AddRolesNavPermissions` migration's `InsertData`/`DeleteData` shape. The stray process was left running rather than killed, since it wasn't started by this work and may be in active use elsewhere.
+> **Not yet applied to a live database** — no Postgres instance was available in this pass to run `dotnet ef database update` against. `dotnet build` is clean (0 warnings/0 errors).
+> **Operational step still needed post-deploy (not code):** a new `NavItem`/`SubNavItem` carries no `RolePermission` grants by default — an administrator must check the new Ledgers permissions for the relevant role(s) via **Settings → Roles** before anyone sees the sidebar entry, same as every previous nav addition.
+
+> ### 2026-07-30 — RBAC nav seed: 8th sub-item for the new "Tax Report" screen
+> The frontend's GL-revision pass (`docs/21-GENERAL-LEDGER-FRONTEND.md`, Frontend/PROGRESS.md §8) added a Tax Report screen to the Ledgers sidebar section — needs the same nav-seed treatment as every other entry (docs/10 C.8). Added `SubNavItem` id 16 (`ledgers.tax-report`, `/dashboard/ledgers/tax-report`, sort order 7) and `Permission` id 27 (`NAV:ledgers.tax-report`); re-sequenced the existing `ledgers.bank-accounts` row's `SortOrder` from 7→8 so Tax Report sits before it, matching the sidebar array's actual order. Migration `AddTaxReportNavSeed` — no locked-process issue this time (confirmed no stray `ERPCore.exe` running before scaffolding), generated cleanly on the first attempt with real `InsertData`/`UpdateData`/`DeleteData` (`Down()` correctly restores `bank-accounts`' `SortOrder` to 7). `dotnet build` clean (0 warnings/0 errors). **Not yet applied to a live database** — same open item as the original `AddLedgersNavSeed` migration; both are still pending `dotnet ef database update` against a real Postgres instance.
+
+> ### 2026-07-30 (2) — Fixed a real `SubNavItemId`/`PermissionId` collision between Procurement and Ledgers seed data
+> **Root cause:** when the 2026-07-20 `AddLedgersNavSeed` migration was authored, its `SubNavItem`/`Permission` IDs were picked by looking at the *actual DB row count*, not the config source — but `SubNavItemConfiguration.cs`/`PermissionConfiguration.cs` already had `HasData` entries for Procurement's 4 sub-items (`procurement.requisitions`/`.rfqs`/`.purchase-orders`/`.purchase-returns`, ids 9–12/19–22) that **had never actually been migrated into any database** (no migration `Up()` anywhere ever inserts them — confirmed by grep across every migration file). Ledgers then claimed the same ids (9–12 sub-nav, 19–22 permission) for its own rows, so the config ended up with two `HasData` entries sharing the same primary key per table. `ErpDbContextModelSnapshot.cs` had silently absorbed both (`dotnet ef migrations add` doesn't hard-fail on this at scaffold time), but **EF's runtime model validator does** — `dotnet ef migrations add` for anything touching these tables, and by extension normal app startup/first `DbContext` use, throws `InvalidOperationException: A seed entity ... has the same key value as another seed entity mapped to the same table`. This is very likely the crash the user was hitting.
+> **Fix:** moved Procurement's 4 sub-nav rows off the colliding ids onto **17–20** (`SubNavItemId`) and **28–31** (`PermissionId`), past every id already claimed by Ledgers/Tax-Report (max 16/27). Removed the phantom duplicate Procurement entries from `ErpDbContextModelSnapshot.cs` (they never reflected real DB state) so the differ could compute a clean diff, then generated migration **`FixProcurementNavIdCollision`** — pure `InsertData` for the 4 sub-nav rows + 4 permission rows at their new ids (this is also the *first* migration that actually creates Procurement's sub-nav-item/permission rows in the database at all). `Down()` is a clean `DeleteData` reversal.
+> **Verified:** running `dotnet ef migrations add` against the pre-fix config reproduced the exact `InvalidOperationException` above (scaffold failed outright, no migration file produced), confirming this was a real, reproducible crash and not a false alarm; after the fix, the same command succeeded and `dotnet ef migrations list` builds the full model with no error, listing all 7 migrations (the last 2 — `AddTaxReportNavSeed`, `FixProcurementNavIdCollision` — still `(Pending)`, no Postgres instance available this session); `dotnet build` clean (0 warnings/0 errors). **Not yet applied to a live database** — same standing blocker as the two prior nav-seed migrations.
+> Also fixed, same pass: `Frontend/erp-system/components/Layouts/AppSidebar.tsx`'s auto-expand-active-parent logic tripped `react-hooks/set-state-in-effect` (`setExpanded` called synchronously inside a `useEffect`) — converted to the same "adjust state during render" pattern used for the Ledgers report pages, keyed on a `pathname + item-codes` composite key (tracked via a `lastAutoExpandKey` state var) so it still re-fires once `items` populates after the RBAC `navCodes` fetch resolves. `npx eslint components/Layouts/AppSidebar.tsx` clean.
+
+> ### 2026-07-31 — RBAC nav seed: new "Accounts" nav item (Cheque Management screens + Cash/Bank Accounts moved off Ledgers)
+> The frontend added a new "Accounts" sidebar section (`Frontend/PROGRESS.md` §8) for the new Cheque Management screens and to hold Cash/Bank Accounts, which moved out of Ledgers into it (user-requested — Cheque Books/Received Cheques/Cash-Bank Accounts are all the same kind of operational account bookkeeping, not a statutory report). Migration **`AddAccountsNavSeed`**: `InsertData` for `NavItem` `accounts` (id 12) and two new `SubNavItem`/`Permission` pairs (`accounts.cheque-books` id 21/33, `accounts.received-cheques` id 22/34); **`UpdateData`, not delete-and-recreate**, for the existing Cash/Bank Accounts `SubNavItem`/`Permission` (ids 15/26) — same ids, just new `Code`/`Href`/`NavItemId` — so a role that had already been granted this permission under its old `ledgers.bank-accounts` code doesn't silently lose it just because the section changed. `Down()` correctly reverses both the inserts and the renamed-row update back to its Ledgers-era values.
+> **No locked-process issue avoided this time** — `ERPCore.exe` was found running twice during this pass (the user had restarted it between turns to test the Tax Report fix); confirmed with the user before killing it each time, per this session's standing caution around stopping their dev server. `dotnet build` clean (0 warnings/0 errors); `dotnet ef migrations list` shows all 8 migrations with none pending. **Applied to the live database this session** (`dotnet ef database update`) — unlike every prior nav-seed migration this session, this one did not have to wait for a live Postgres instance to become available.
+> **Operational step still needed post-deploy (not code):** same as every previous nav addition — an administrator must grant the new `NAV:accounts`/`NAV:accounts.cheque-books`/`NAV:accounts.received-cheques` permissions to the relevant role(s) via **Settings → Roles** before anyone sees the new sidebar entries (the re-homed `NAV:accounts.bank-accounts` keeps whatever grants it already had).
+
+> ### 2026-07-31 (2) — Root-caused and fixed a repo-wide bug: 36 tables (all of HRM + all of Manufacturing) existed in the EF model but not in the actual database, and no `dotnet ef migrations add` could ever surface it
+> **User-reported:** after rebasing `feat/general-ledger-service` onto `origin/Dev`, some tables from the other branch weren't being created by `migrations add` + `database update`. Ground-truthed against the live Postgres instance (queried `pg_tables`/`__EFMigrationsHistory` directly, since EF's own diff tooling only ever compares the compiled model against `ErpDbContextModelSnapshot.cs` — never the real database — so it's structurally blind to this class of bug): the database had 45 tables; the current model/snapshot expects 80. All 25 `hr_*` tables and all 11 `production_runs`/`production_templates`/`run_*`/`stage_*`/`template_stages` tables were completely absent, despite `ErpDbContext`/`Infra/Persistence/Configurations` fully describing them and `ErpDbContextModelSnapshot.cs` already listing them.
+> **Root cause: a `.gitignore` rule (`**/Migrations/`, added early on to stop *new* EF migrations from being committed) combined disastrously with `ErpDbContextModelSnapshot.cs` staying tracked** (`.gitignore` doesn't retroactively untrack already-tracked files, and the snapshot was one of the original 4 tracked migrations). Every `dotnet ef migrations add` after that point updated the snapshot (which **did** get committed normally, since it was already tracked) but wrote its actual migration `.cs`/`.Designer.cs` pair as new, gitignored, never-committed files. Confirmed via `git show --stat` on every historical commit touching the snapshot: several — including the commit that added the entire HRM module and the one that added Manufacturing (`7d6e597`) — show large snapshot insertions with **zero** migration files in the same commit. Net effect: the snapshot has been silently lying about the applied-migration history for a long time; `dotnet ef migrations add` never detects a "missing" table because, as far as the (already-tracked, already-correct-looking) snapshot is concerned, nothing has changed — the actual `CreateTable` migration simply never existed anywhere in git, on any machine that didn't happen to still have it sitting locally, ungitignored-but-untracked.
+> **Fix, in order:**
+> 1. Confirmed the exact 36-table gap by comparing `pg_tables` against every `b.ToTable(...)` call in the snapshot (script, not archaeology — this is the only way to get ground truth once the snapshot itself is suspect).
+> 2. Temporarily removed just those 36 entities' blocks from `ErpDbContextModelSnapshot.cs` (verified 2–3 balanced-brace occurrences per entity removed cleanly, nothing else touched), so `dotnet ef migrations add` would have something real to diff against.
+> 3. Generated **`AddMissingHrmAndManufacturingTables`** — verified its `Up()` contains exactly 36 `CreateTable` calls (matching the missing-table list precisely, no more/fewer) and its `Down()` exactly 36 matching `DropTable` calls; no `AlterColumn`/`DropColumn`/`RenameColumn` against any pre-existing table, confirming this was a pure addition with zero collateral schema drift.
+> 4. Applied it (`dotnet ef database update`); re-queried `pg_tables` live — all 81 tables (80 + `__EFMigrationsHistory`) now present. Confirmed fully settled by scaffolding one more throwaway migration afterward and checking it came back empty (no remaining model/snapshot drift), then removing it.
+> 5. **Fixed the actual root cause, not just this one symptom:** reverted the `.gitignore` rule — EF Core migrations are now tracked like any other source file, so this can't recur the same way. Every migration created since the rule was added (`AddLedgersNavSeed`, `AddTaxReportNavSeed`, `FixProcurementNavIdCollision`, `AddAccountsNavSeed`, the empty `production` migration, and this pass's `AddMissingHrmAndManufacturingTables`) was sitting on disk ungitignored-but-uncommitted the whole time — now staged to actually join the repo.
+> **Verified:** `dotnet build` clean (0 errors, pre-existing `CS8981` naming warning on the already-present `production` migration class only); `dotnet ef migrations list` shows all 10 migrations, none pending. **A locally running `ERPCore.exe` had to be stopped mid-session (user's explicit approval obtained first) to free the build lock**, same recurring issue as every previous migration pass this week.
+> **Left as-is, deliberately:** the empty `production` migration (`20260731123720_production.cs`) — it's a harmless no-op (it was the user's own prior attempt to fix this exact bug, which came back empty for the reason explained above) and renaming/removing it now would just be churn; the real fix landed in the next migration.
+> **Action needed from the user:** the `.gitignore` fix means these migration files are no longer excluded, but nothing has been `git add`ed or committed yet — per standing instruction, commits only happen when explicitly asked.
+
 ## Deferred (Phase 2+ — do NOT build now, hooks only)
 - [ ] Vendor invoice + three-way match
 - [ ] Reservation/allocation fulfilment
diff --git a/Frontend/PROGRESS.md b/Frontend/PROGRESS.md
index 90d3a13..0d154fb 100644
--- a/Frontend/PROGRESS.md
+++ b/Frontend/PROGRESS.md
@@ -42,6 +42,13 @@ Convention: `docs/01-DOC-GUIDE.md §6`. Update this file in the **same commit**
 - [~] Purchase Order (`.../purchase-orders` list, `/new` create — **Save as draft** or **Create & submit** (auto-approve), prefillable from a Requisition or an RFQ+vendor quotation via query params — `/[id]` detail: **Draft** is editable (ETag/If-Match) with **Submit** + **Delete**; a submitted/open PO is read-only with **Cancel** (with reason)) — FR-PROC-03..07. **2026-07-20:** rewired to the draft lifecycle — `isPoEditable` is now `Draft`-only, `submit`/`remove` added to `lib/api/purchase-orders.ts`, `saveAsDraft` on the create request. See the 2026-07-20 entry.
 - [~] Purchase Return (`.../purchase-returns` list, `/new` create against a Confirmed/Closed GRN's lines) — FR-PROC-08; also reachable from a `Rejected` GRN line via a "Create Return" button on the GRN detail page
 
+## 3.5 Sales screens
+- [~] Sales hub (`app/dashboard/sales`) — new module entry point linking to invoices, slips, free issues, and reports
+- [~] Sales invoices (`app/dashboard/sales/invoices`, `/new`, `/[id]`) — list/detail/create/edit routing wired to the real sales invoice API, including save/post/cancel on the detail page
+- [~] Sales slips (`app/dashboard/sales/slips`, `/new`, `/[id]`) — list/detail/create/edit routing wired to the real sales slip API, including save/post/cancel on the detail page
+- [~] Free issues (`app/dashboard/sales/free-issues`, `/new`, `/[id]`) — alias-only surface over sales slips for free-issue handling; edit/save/post/cancel stays on the slip screen
+- [~] Sales reports (`app/dashboard/sales/reports`, `/[reportId]`) — report catalog + report metadata view wired to `/reports/sales`
+
 ## 4. Receiving screens
 - [~] GRN list (`app/dashboard/receiving/grn/page.tsx`) — loading/empty/error states, links to detail
 - [~] GRN create (`app/dashboard/receiving/grn/new/page.tsx`) — "Against PO" (picks an Approved/PartiallyReceived PO, prefills open lines) and "Direct receipt" (vendor + manual lines) modes; per-line bin, qty, unit cost, **discount % / VAT %** (with live after-discount/after-VAT line total + a per-row PO-price variance hint and a document total), hold status, and batch (batchNo+expiryDate) or serial-number-list capture driven by the item's `trackingMode`. **2026-07-20:** discount/VAT/variance added — see the 2026-07-20 entry. **2026-07-22:** "Add line" now works in **PO mode** (off-PO items) + **"New item"** (opens `/dashboard/products/new` in a new tab) + **refresh** icon — see the 2026-07-22 entry.
@@ -83,6 +90,46 @@ Convention: `docs/01-DOC-GUIDE.md §6`. Update this file in the **same commit**
 - [ ] `412` conflict → prompt refetch before retry — `apiRequestWithETag` surfaces the ETag but no screen edits a GRN yet (GRN has no PUT), so untested in practice
 - [x] No client-side gating on stock/availability/status (server-authoritative) — GRN create always submits to the server and surfaces `OVER_RECEIPT_TOLERANCE`/etc. via `error-map.ts` rather than pre-blocking
 
+## 8. General Ledger (Ledgers + Accounts sections)
+> Two sidebar sections (`app/dashboard/ledgers/*`, `app/dashboard/accounts/*`), sourced entirely from the external General Ledger service via ERPCore's generic proxy (`docs/12-GENERAL-LEDGER-INTEGRATION.md`). Full detail, decisions, and known gaps: `docs/21-GENERAL-LEDGER-FRONTEND.md`.
+- [x] Ledgers: reports hub + 7 report screens (Trial Balance, Balance Sheet, General Ledger, Profit & Loss, Cash Flow, Budget vs Actual, Tax Report) — statutory-format header/table, PDF **and CSV** download via the same endpoint with `outputFormat=Pdf`/`Csv`
+- [x] Accounts: hub + Cash/Bank Accounts — unified list (GL's own server-side `accountType` union + client-side text search) + create (Cash/Bank toggle; GL account is now auto-created server-side, **no picker** — see 2026-07-31 (6) below). **Moved here from Ledgers (2026-07-31 (5))**
+- [ ] Cash/Bank Accounts — edit: **not built**, GL has no `GET`/`PUT` by id for either table to build it against (list shows a disabled Edit affordance with an explanatory tooltip instead of a broken form)
+- [x] Accounts: Cheque Books — list/filter, create (auto-generates every leaf), drill-down to a book's own pages list, per-page details/issue/status-update in a modal
+- [x] Accounts: Received Cheques — list/filter, create, per-row details/status-update in a modal
+- [x] Sidebar "Ledgers" (7 sub-items) + new "Accounts" (3 sub-items) nav items (`components/Layouts/AppSidebar.tsx`) + header title mappings (`components/Layouts/Header.tsx`)
+- [x] Dedicated GL fetch client (`lib/api/general-ledger.ts`) — GL's envelope differs from ERPCore's own `ProblemDetails`, so this does not reuse `lib/api-client.ts`; now also covers Cheque Management (`chequeBooksApi`/`chequePagesApi`/`receivedChequesApi`)
+
+> **2026-07-30 — GL's 2026-07-22 backend revision built out (large pass).** Five reports restructured (Trial Balance flattened, Profit & Loss → nested named sections with a Gross Profit subtotal, Cash Flow → a real structured statement replacing the four `StatCard`s), a new CSV export on all seven reports (`components/reports/DownloadCsvButton.tsx`), a brand-new **Tax Report** screen (Income Tax Computation, collapsible optional-adjustments panel, payable/refundable sign-dependent final row), and Cash/Bank accounts split into two real GL endpoints (`POST /bank-accounts` vs `POST /cash-accounts`, unified `GET /bank-accounts?accountType=`) with a two-choice create-form toggle and a Cash Account Type picker that can create a new type on the fly. Extracted `components/reports/{ReportSection,ReportSubtotal}.tsx` — shared by Profit & Loss and Cash Flow rather than duplicating the "bordered section + bold subtotal" markup twice. Three response shapes (`ProfitAndLossResponse`/`CashFlowResponse`/`TaxSummaryResponse`) are **inferred** where GL's own reference doesn't spell out every field verbatim — flagged in `types/general-ledger.ts`'s own comments and `docs/21-GENERAL-LEDGER-FRONTEND.md`, same posture as the original inferred `BankAccount` shape. Backend: migration `AddTaxReportNavSeed` adds the 8th sidebar sub-item + its permission row. Verified: `tsc --noEmit` clean, `eslint` clean across every touched file, `npm run build` succeeds with all 9 `/dashboard/ledgers/*` routes (incl. `/tax-report`), `dotnet build` clean. **Not done:** live smoke test against a running GL instance (still no instance available this session) — the three inferred response shapes are the highest-value thing to verify first.
+
+> **2026-07-20, same-day fixes (user-reported):** (1) General Ledger report was wrongly calling `GET /accounts` to populate an account picker — GL documents `accountId` on this report as a raw id, not a code-lookup value, so the picker is gone; the screen now only ever calls `/reports`, entering `accountId` directly and reading the account's code/name for display off the report's own returned rows instead. (2) `ReportType`/`ReportOutputFormat`/`GlAccountTypeId` converted from string/numeric literal unions to real TS enums. (3) Fixed a UI-only bug where a selected `<Select>` (Bank Account create's GL-account picker, Budget vs Actual's budget picker) displayed the raw numeric value instead of its label after selection — the underlying value sent to the server was always correct; `@base-ui/react/select`'s `Select.Value` needs an explicit `label` prop per `<SelectItem>` (separate from `children`) to resolve display text, which neither picker was passing. Fixed at the two call sites, not the shared `components/ui/select.tsx` primitive (out of scope — other numeric-valued `<Select>`s elsewhere in the app likely share this latent bug; flagged in `docs/21-GENERAL-LEDGER-FRONTEND.md` §4 for whoever next touches one). Verified: `tsc --noEmit` and `eslint` clean.
+>
+> **2026-07-20 (2) — `react-hooks/set-state-in-effect` errors resolved, Ledgers pages only (scope confirmed with the user — this is not an app-wide lint pass; the same error is pre-existing on ~35 other files elsewhere in the app, left untouched).** All 7 report/list screens called `setState` synchronously as the first statement of a data-fetching effect (clearing stale results before the async call) — flagged as an error, not just a warning, by this project's current eslint config. Fixed with React's own "adjust state during render" pattern instead of an effect: each page now tracks the key it last loaded for (`asOfDate`/period/`accountId`/`budgetId`) in a small extra piece of state, and resets the result/error state **during render** when that key changes (before the effect below ever runs) rather than synchronously inside the effect. Behavior is unchanged — stale results still clear the instant a filter changes. `bank-accounts/page.tsx`'s mount-only `load()` had a redundant `setError(null)` (state already starts `null`; nothing else ever recalls `load()`), removed outright rather than worked around. Verified: `npx eslint app/dashboard/ledgers` produces zero output, `tsc --noEmit` clean, `npm run build` succeeds.
+>
+> **2026-07-31 — Fixed a live runtime crash on Cash Flow: GL omits empty list/section fields entirely instead of sending `[]`/`{lines:[],total:0}`.** User-reported error clicking into the page: `TypeError: Cannot read properties of undefined (reading 'map')` at `bucketOperatingLines` → `report.nonCashAdjustments.map(...)`, confirming the exact risk `CashFlowResponse` had been flagged with since it was built (inferred shape, never verified live). Root cause: GL's serializer drops a list/section property from the JSON body altogether when there's nothing to report for the period, rather than emitting an empty array/zero-totalled object. Fixed defensively in `cash-flow/page.tsx` (`?? []` on `nonCashAdjustments`/`workingCapitalChanges`, a new `activitySectionLines()` helper + optional chaining for `investingActivities`/`financingActivities`/their `.total`) and, proactively, in `profit-and-loss/page.tsx` (`isEmpty` check and every section's `.total` access) since `ProfitAndLossResponse` shares the identical nested-section shape and was equally exposed — not yet crashed on, but certain to under the same conditions (a section with nothing posted for the period). `types/general-ledger.ts`'s `CashFlowResponse`/`ProfitAndLossResponse` fields updated from required to optional to match, with comments pointing back at this confirmed-live behavior. Verified: `tsc --noEmit`/`eslint` clean on all touched files; `npm run build`'s TypeScript step fails, but only on a pre-existing, unrelated `app/dashboard/hrm/employees/[id]/page.tsx` error present before this pass — out of scope per standing instruction to keep fixes scoped to Ledgers. **Tax Report's `TaxSummaryResponse` is the one remaining inferred shape not yet defensively hardened or live-verified** — same class of risk, flagged for the next time that screen is touched.
+>
+> **2026-07-31 (2) — Corrected against GL's own authoritative API reference (`04_API_Reference_And_Scenarios.md`, user-supplied): Cash Flow's shape was fundamentally wrong, not just missing defensive guards; Tax Report was missing five real fields.** With the actual GL API reference in hand (not inference), checked every report's response shape against it: Trial Balance, Balance Sheet, General Ledger, Profit & Loss, and Budget vs Actual all match exactly, confirming those five were built correctly. Two did not: **(1) `CashFlowResponse` doesn't have `netEarnings`/`nonCashAdjustments`/`workingCapitalChanges`/`netCashFromOperations` as flat top-level fields at all — everything genuinely nests under `operatingActivities` (`{ profitForPeriod, nonCashAdjustments[], workingCapitalChanges[], netCashFromOperatingActivities }`), and `investingActivities`/`financingActivities` each carry their own differently-named total (`netCashFromInvestingActivities`/`netCashFromFinancingActivities`), not a shared `total`.** This — not just "the field might be missing" — was the real cause of the crash fixed in the previous entry; the previous fix's defensive `?? []` guards were correct in spirit but pointed at the wrong (nonexistent) top-level fields, so the page would have kept rendering an empty operating-activities section forever even without crashing. Rewrote `cash-flow/page.tsx` and `CashFlowResponse`/added `CashFlowOperatingActivities`/`CashFlowInvestingActivities`/`CashFlowFinancingActivities` to `types/general-ledger.ts` to match the confirmed contract exactly; also caught that `workingCapitalChanges[]` entries use `changeAmount`, not `amount`. **(2) `TaxSummaryResponse`/the Tax Report's `ROWS` table were missing `nonDeductibleExpenses`, `corporateIncomeTax`, `apitCredit`, `whtCredit`, and `quarterlyTaxPayments` entirely** — real GL-computed figures that were silently never rendered, not just a wrong guess at a field name. Added all five in their correct position in the confirmed row order (`profitBeforeTax` → `balanceTaxPayable`). Verified: `tsc --noEmit`/`eslint` clean on every touched file.
+>
+> **2026-07-31 (3) — Balance Sheet regrouped into a proper LKAS Statement of Financial Position layout (user-reported).** `BalanceSheetRow`'s shape was already correct (confirmed against GL's reference above), but the flat one-table rendering made a rollup total visually indistinguishable from the leaf amounts it already sums — e.g. "Cash and Bank"'s balance already includes "Petty Cash"/"Main Operating Bank Account"/"Savings Bank Account" beneath it, but every row read the same weight (only `depth===0` did any, subtle, bolding), inviting a user to double-count by adding up everything they see. Rewrote `balance-sheet/page.tsx`: rows now group by `accountType` into ASSETS/LIABILITIES/EQUITY sections, each ending in a bold "Total {Section Name}" row (summed from that section's depth-0 rows only — a depth-0 row's balance already rolls up its own descendants, so summing depth-0 rows avoids double-counting), any row with a deeper row immediately following it is bolded as a rollup regardless of its own depth (not just the very top level), and a final "Total Liabilities and Equity" row for the standard balance-check. One quirk handled explicitly: GL's synthetic "Current Year Earnings" balancing row is documented to always carry `depth: 1` even though it's a peer Equity entry, not a child of whatever real account happens to precede it — a new `effectiveDepth()` helper special-cases it to 0 so it isn't mis-rendered as nested under (and excluded from the total alongside) an unrelated account. Manually verified the new grouping/summing logic against the actual numbers from the reported screenshot: Total Assets (5,880,466.50) = Total Liabilities (2,025,000.00) + Total Equity (3,855,466.50), exact match. Verified: `tsc --noEmit`/`eslint` clean.
+>
+> **2026-07-31 (4) — Superseded by GL's own retrofit: `BalanceSheet` is a genuinely different, classified response shape now, not just a re-grouping of the same flat array.** GL's own API reference (user-supplied) documents a 2026-07-31 backend retrofit: the flat recursive-rollup array (`{depth, lineItem, accountType, balance}`, what entry (3) above regrouped client-side) is replaced entirely by a **pre-classified nested object** — `{ asOfDate, nonCurrentAssets: {lines[], total}, currentAssets: {lines[], total}, unclassifiedAssets: {lines[], total}, totalAssets, equity: {lines[], total}, nonCurrentLiabilities: {lines[], total}, currentLiabilities: {lines[], total}, unclassifiedLiabilities: {lines[], total}, totalEquityAndLiabilities }`, driven by a new `accounts.balance_sheet_classification` tag GL now maintains server-side. This means entry (3)'s client-side grouping/rollup logic (`effectiveDepth`, `sectionTotal`, the `depth`-based rollup-bolding) is entirely obsolete — GL now does the Non-Current/Current classification itself, the frontend just renders the sections it's given. Replaced `BalanceSheetRow` with `BalanceSheetLine`/`BalanceSheetSection`/`BalanceSheetResponse` in `types/general-ledger.ts` (every section marked optional, same defensive posture adopted for `CashFlowResponse`/`ProfitAndLossResponse` after the Cash Flow crash, since this exact shape isn't live-verified against this frontend yet) and rewrote `balance-sheet/page.tsx` from scratch to consume it. **Also changed the layout to match a user-supplied reference Statement of Financial Position image** (a real classified SOFP: Non-Current Assets/Current Assets each their own subtotaled block, then Equity and Liabilities the same way, ending in a Total Assets vs Total Equity-and-Liabilities check) — rather than inventing new one-off markup for this, reused the same `ReportSection`/`ReportSubtotal` shared components Profit & Loss and Cash Flow already use (one `ReportSection` per GL-provided section, a `ReportSubtotal` for each side's grand total), keeping Balance Sheet visually and structurally consistent with the rest of the Ledgers screens rather than a bespoke table. Account codes are deliberately not shown per line (the reference template shows plain line-item names only). Verified: `tsc --noEmit`/`eslint` clean; grepped the codebase to confirm no lingering references to the removed `BalanceSheetRow`/flat shape.
+>
+> **2026-07-31 (5) — New "Accounts" nav section: Cheque Management built out, Cash/Bank Accounts moved under it.** New Cheque Management module (`04_API_Reference_And_Scenarios.md`, Module: Cheque Management — added to GL 2026-07-30, beyond its original plan): two independent sub-areas, **Cheque Books/Pages** (cheques issued from this company's own supply) and **Received Cheques** (cheques received from others, deliberately unlinked to any cheque book). Added `PayeeType`/`ReceivedFromType`/`ChequeBookStatus`/`ChequePageIssueStatus`/`ChequePageStatusAction`/`ReceivedChequeStatus`/`ReceivedChequeStatusAction` enums and `ChequeBook`/`ChequePage`/`ReceivedCheque` (+ their create/status-update request types) to `types/general-ledger.ts`, and `chequeBooksApi`/`chequePagesApi`/`receivedChequesApi` to `lib/api/general-ledger.ts`. `branchId`/`companyId`/`payeeId`/`voucherId`/`referenceId` are GL's own documented "loose references" (no Branch/Company/Customer/Supplier table exists in that service) — taken as plain numeric inputs, not picker dropdowns, matching GL's stated design rather than fabricating master data that doesn't exist.
+>
+> **Cheque Books** (`app/dashboard/accounts/cheque-books/{page,new,[chequeBookNo]/page}.tsx`): list with a status filter, create form (bank account picker restricted to `Bank`-type accounts only — GL's own module note says cheque books are bank-account-only, never cash-account), and a book-detail page showing every leaf (`GET /cheque-books/{chequeBookNo}?expand=pages`) — clicking a leaf opens `components/accounts/ChequePageDialog.tsx`, a modal with read-only details plus status-appropriate actions (`Unused` → Issue/Cancel/Void; `Issued` → Clear/Bounce/Cancel; terminal statuses → read-only), each action revealing only the fields that specific transition actually needs (e.g. Clear asks for `clearedDate`, Cancel asks for `cancelReason`, Bounce/Void need nothing beyond an optional `performedBy`). A modal was chosen over a second-level page for the leaf-details view (left open in the request) so working through several leaves in one book doesn't lose the list's scroll position/context each time.
+>
+> **Received Cheques** (`app/dashboard/accounts/received-cheques/{page,new/page}.tsx` + `components/accounts/ReceivedChequeDialog.tsx`): same list-then-modal shape — status filter, create form, and a details/status-update modal (`Received` → Deposit/Cancel; `Deposited` → Clear/Return), Deposit asking for a bank-account picker + date, the rest needing nothing beyond an optional note.
+>
+> **2026-07-31 (6) — Two user-reported fixes: `glAccountCode` removed from Cash/Bank Account creation (further GL retrofit), and the three GL create-form pages widened to fill the page.** (1) GL's reference now documents that `POST /bank-accounts`/`POST /cash-accounts` no longer accept `glAccountCode` — the backing GL account (a `Bank`/`Cash` root, plus a type-header node for Cash) is always found-or-created server-side, never caller-selected. Removed the field from `CreateBankAccountRequest`/`CreateCashAccountRequest`, deleted the "GL account" `Select` and its `glAccountsApi.list()` fetch from `bank-accounts/new/page.tsx` outright, and dropped the check from `validateBankAccountForm`. Typed the create response as a new `CreateCashOrBankAccountResponse` (`glAccount` nested, confirmed from GL's doc) so the success toast can surface the auto-generated GL account code. The Cash/Bank **list** page is untouched — GL's list endpoint still returns a flat `glAccountId` per row, still resolved via `glAccountsApi.list()` there. (2) `bank-accounts/new`, `cheque-books/new`, and `received-cheques/new` each wrapped their form in a `max-w-lg` card, leaving roughly half of any normal desktop screen blank. Dropped the `max-w-lg` cap (now full-width, matching the un-capped card convention every report page already uses) and replaced the vertical one-field-per-row stacking (plus scattered ad-hoc `grid grid-cols-2` pairs) with one consistent `grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3` wrapper per form. Left the two modals (`ChequePageDialog`/`ReceivedChequeDialog`) at their existing fixed width on purpose — the complaint was about full-page create forms, not dialogs. Verified: `tsc --noEmit`/`eslint` clean on every touched file; `npm run build`'s Turbopack compile succeeds, its TypeScript step fails only on the same pre-existing, unrelated `app/dashboard/hrm/employees/[id]/page.tsx` error noted in earlier entries.
+>
+> **Cash/Bank Accounts moved from Ledgers to the new Accounts section** (user-requested), since it's the same kind of "operational account bookkeeping" as cheques, not a statutory report — `app/dashboard/ledgers/bank-accounts/*` relocated verbatim to `app/dashboard/accounts/bank-accounts/*` (internal links updated, no behavior change), removed from the Ledgers hub's card grid.
+>
+> **Backend:** migration `AddAccountsNavSeed` adds `NavItem` `accounts` (id 12) and two new `SubNavItem`/`Permission` pairs (`accounts.cheque-books`, `accounts.received-cheques`), and **re-homes** the existing Cash/Bank Accounts `SubNavItem`/`Permission` (ids 15/26) from Ledgers to Accounts via `UpdateData` (new `Code`/`Href`/`NavItemId`) rather than delete-and-recreate — keeps the same ids so any role already granted that permission doesn't silently lose it just because the section it lives under changed. Applied to the live database this session (`dotnet ef database update`).
+>
+> **Fields not explicitly spelled out verbatim in GL's reference** (its own numeric-id column names for `ChequeBook`/`ChequePage`, and `ReceivedCheque`'s JSON id field) are built from the request-body field names GL *does* document plus this project's consistent `<entity>Id` convention, flagged in `types/general-ledger.ts`'s comments — `chequeNo`/`chequeBookNo` (both explicitly documented as the identifying route values) are used for keys/URLs throughout instead, sidestepping the guess entirely wherever possible. **Not done:** live smoke test against a running GL instance — this entire module is unverified against real Cheque Management data. Verified: `tsc --noEmit`/`eslint` clean on every touched file; `npm run build` compiles successfully (Turbopack), its full-project TypeScript check still blocked only by the pre-existing, unrelated `hrm/employees/[id]` error.
+>
+> **2026-07-20 (3) — General Ledger report corrected again: `accountId` dropped entirely, not just made direct-entry.** The GL service's own contract changed (confirmed against its updated docs): `GeneralLedger`'s `accountId` is now optional, and the *omitted* case is the real General Ledger (every postable account together, each with its own running balance, sorted by `accountCode` then `entryDate`) — supplying `accountId` is a separate "Account Ledger" (single account + descendants) mode this page doesn't use. Superseding the same-day entry above: the numeric Account ID input is gone, `reportsApi.generalLedger()` dropped the `accountId` parameter, and the page now fetches on `periodStart`/`periodEnd` alone with sensible defaults — auto-fetching on page load like every other report screen (this also resolves the earlier-reported "no network call when landing on the page," which was the now-removed account-required gate). Result rows are grouped into per-account sections in the table (a header row wherever `accountCode` changes), matching the API's per-account running-balance reset. No frontend change was needed for the same-day `BalanceSheet` response addition (a synthetic `"Current Year Earnings"` equity row) — the existing generic row renderer already displays whatever rows come back. Verified: `tsc --noEmit` clean, `npx eslint app/dashboard/ledgers lib/api/general-ledger.ts` produces zero output, `npm run build` succeeds.
+
 ## 7. UX states
 - [~] Loading / empty / error states on every list — done for the GRN list/create/detail screens; other screens still unbuilt
 - [x] Transactional actions show server-returned side effects as confirmation — GRN confirm renders `createdLayers`/`ledgerRefs`/`poStatus` from the response
diff --git a/Frontend/erp-system/app/dashboard/accounts/bank-accounts/new/page.tsx b/Frontend/erp-system/app/dashboard/accounts/bank-accounts/new/page.tsx
new file mode 100644
index 0000000..c80eab0
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/accounts/bank-accounts/new/page.tsx
@@ -0,0 +1,204 @@
+"use client"
+
+import { useEffect, useState } from "react"
+import Link from "next/link"
+import { useRouter } from "next/navigation"
+import { ArrowLeft } from "lucide-react"
+
+import { bankAccountsApi, cashAccountTypesApi } from "@/lib/api/general-ledger"
+import { errorMessage } from "@/lib/error-map"
+import { validateBankAccountForm } from "@/lib/validations/general-ledger"
+import { cn } from "@/lib/utils"
+import { CashAccountType, CashBankAccountType } from "@/types/general-ledger"
+
+import { Button, buttonVariants } from "@/components/ui/button"
+import { Field, FieldError, FieldLabel } from "@/components/ui/field"
+import { Input } from "@/components/ui/input"
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
+import { toast } from "@/components/ui/toast"
+
+const OTHER_CASH_TYPE = "__other__"
+
+export default function NewBankAccountPage() {
+  const router = useRouter()
+
+  const [accountType, setAccountType] = useState<CashBankAccountType>(CashBankAccountType.Bank)
+
+  const [cashAccountTypes, setCashAccountTypes] = useState<CashAccountType[] | null>(null)
+  const [cashAccountTypesError, setCashAccountTypesError] = useState<string | null>(null)
+
+  const [accountName, setAccountName] = useState("")
+  const [bankName, setBankName] = useState("")
+  const [cashAccountTypeChoice, setCashAccountTypeChoice] = useState("")
+  const [customCashAccountTypeName, setCustomCashAccountTypeName] = useState("")
+  const [accountNumber, setAccountNumber] = useState("")
+  const [currencyCode, setCurrencyCode] = useState("LKR")
+  const [errors, setErrors] = useState<Record<string, string>>({})
+  const [submitting, setSubmitting] = useState(false)
+
+  useEffect(() => {
+    if (accountType !== CashBankAccountType.Cash || cashAccountTypes !== null) return
+    cashAccountTypesApi
+      .list()
+      .then(setCashAccountTypes)
+      .catch((err) => setCashAccountTypesError(errorMessage(err)))
+    // Only fetched once, lazily, the first time "Cash" is selected.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [accountType])
+
+  const cashAccountTypeName =
+    cashAccountTypeChoice === OTHER_CASH_TYPE ? customCashAccountTypeName.trim() : cashAccountTypeChoice
+
+  async function handleSubmit() {
+    const nextErrors = validateBankAccountForm({ accountName })
+    if (accountType === CashBankAccountType.Cash && !cashAccountTypeName) {
+      nextErrors.cashAccountTypeName = "Select or enter a cash account type"
+    }
+    setErrors(nextErrors)
+    if (Object.keys(nextErrors).length > 0) return
+
+    setSubmitting(true)
+    try {
+      const created =
+        accountType === CashBankAccountType.Bank
+          ? await bankAccountsApi.createBank({
+              accountName,
+              bankName: bankName || null,
+              accountNumber: accountNumber || null,
+              currencyCode: currencyCode || undefined,
+            })
+          : await bankAccountsApi.createCash({
+              accountName,
+              cashAccountTypeName,
+              accountNumber: accountNumber || null,
+              currencyCode: currencyCode || undefined,
+            })
+      toast.success(`${accountType} account created`, `${created.accountName} — GL account ${created.glAccount.accountCode}`)
+      router.push("/dashboard/accounts/bank-accounts")
+    } catch (err) {
+      toast.error(`Could not create ${accountType.toLowerCase()} account`, errorMessage(err))
+    } finally {
+      setSubmitting(false)
+    }
+  }
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex items-center gap-3">
+        <Link href="/dashboard/accounts/bank-accounts" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
+          <ArrowLeft className="size-5" />
+        </Link>
+        <div>
+          <h1 className="text-2xl font-bold text-foreground">New Cash / Bank Account</h1>
+          <p className="text-base text-muted-foreground">
+            Its ledger account is created automatically — no need to pick one.
+          </p>
+        </div>
+      </div>
+
+      <div className="rounded-2xl bg-white p-6 shadow-sm ring-1 ring-black/5">
+        <div className="mb-6 flex max-w-sm gap-2">
+          <Button
+            type="button"
+            variant={accountType === CashBankAccountType.Bank ? "default" : "outline"}
+            className="flex-1"
+            onClick={() => setAccountType(CashBankAccountType.Bank)}
+          >
+            Bank
+          </Button>
+          <Button
+            type="button"
+            variant={accountType === CashBankAccountType.Cash ? "default" : "outline"}
+            className="flex-1"
+            onClick={() => setAccountType(CashBankAccountType.Cash)}
+          >
+            Cash
+          </Button>
+        </div>
+
+        <div className="grid grid-cols-1 gap-x-6 gap-y-5 sm:grid-cols-2 lg:grid-cols-3">
+          <Field data-invalid={!!errors.accountName}>
+            <FieldLabel htmlFor="ba-name">Account name</FieldLabel>
+            <Input
+              id="ba-name"
+              value={accountName}
+              onChange={(e) => setAccountName(e.target.value)}
+              placeholder={accountType === CashBankAccountType.Bank ? "Main Account" : "Head Office Petty Cash"}
+              aria-invalid={!!errors.accountName}
+            />
+            <FieldError errors={[errors.accountName ? { message: errors.accountName } : undefined]} />
+          </Field>
+
+          {accountType === CashBankAccountType.Bank ? (
+            <>
+              <Field>
+                <FieldLabel htmlFor="ba-bank">Bank name (optional)</FieldLabel>
+                <Input id="ba-bank" value={bankName} onChange={(e) => setBankName(e.target.value)} placeholder="Commercial Bank" />
+              </Field>
+              <Field>
+                <FieldLabel htmlFor="ba-acct-no">Account number (optional)</FieldLabel>
+                <Input id="ba-acct-no" value={accountNumber} onChange={(e) => setAccountNumber(e.target.value)} placeholder="8001234567" />
+              </Field>
+            </>
+          ) : (
+            <>
+              <Field data-invalid={!!errors.cashAccountTypeName}>
+                <FieldLabel htmlFor="ba-cash-type">Cash account type</FieldLabel>
+                <Select<string> value={cashAccountTypeChoice} onValueChange={(v) => setCashAccountTypeChoice(v ?? "")}>
+                  <SelectTrigger id="ba-cash-type" className="w-full text-base" aria-invalid={!!errors.cashAccountTypeName}>
+                    <SelectValue placeholder={cashAccountTypes === null ? "Loading…" : "Select a type"} />
+                  </SelectTrigger>
+                  <SelectContent>
+                    {(cashAccountTypes ?? []).map((t) => (
+                      <SelectItem key={t.cashAccountTypeId} value={t.name} label={t.name} className="text-base">
+                        {t.name}
+                      </SelectItem>
+                    ))}
+                    <SelectItem value={OTHER_CASH_TYPE} label="Other, please specify" className="text-base">
+                      Other, please specify…
+                    </SelectItem>
+                  </SelectContent>
+                </Select>
+                {cashAccountTypeChoice === OTHER_CASH_TYPE && (
+                  <Input
+                    value={customCashAccountTypeName}
+                    onChange={(e) => setCustomCashAccountTypeName(e.target.value)}
+                    placeholder="e.g. Site Cash"
+                    className="mt-2"
+                  />
+                )}
+                {cashAccountTypesError && (
+                  <p className="text-sm text-destructive">{cashAccountTypesError}</p>
+                )}
+                <FieldError errors={[errors.cashAccountTypeName ? { message: errors.cashAccountTypeName } : undefined]} />
+              </Field>
+              <Field>
+                <FieldLabel htmlFor="ba-acct-no">Account number (optional)</FieldLabel>
+                <Input
+                  id="ba-acct-no"
+                  value={accountNumber}
+                  onChange={(e) => setAccountNumber(e.target.value)}
+                  placeholder="Auto-generated if left blank"
+                />
+              </Field>
+            </>
+          )}
+
+          <Field>
+            <FieldLabel htmlFor="ba-currency">Currency</FieldLabel>
+            <Input id="ba-currency" value={currencyCode} onChange={(e) => setCurrencyCode(e.target.value)} maxLength={3} placeholder="LKR" />
+          </Field>
+        </div>
+
+        <div className="mt-6 flex justify-end gap-3">
+          <Link href="/dashboard/accounts/bank-accounts" className={cn(buttonVariants({ variant: "outline" }), "min-w-36")}>
+            Cancel
+          </Link>
+          <Button className="min-w-36" onClick={handleSubmit} disabled={submitting}>
+            {submitting ? "Creating…" : "Create"}
+          </Button>
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/accounts/bank-accounts/page.tsx b/Frontend/erp-system/app/dashboard/accounts/bank-accounts/page.tsx
new file mode 100644
index 0000000..214ff90
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/accounts/bank-accounts/page.tsx
@@ -0,0 +1,192 @@
+"use client"
+
+import { useEffect, useMemo, useState } from "react"
+import Link from "next/link"
+import { ArrowLeft, Pencil, Plus, Search, Wallet } from "lucide-react"
+
+import { bankAccountsApi, glAccountsApi } from "@/lib/api/general-ledger"
+import { errorMessage } from "@/lib/error-map"
+import { formatReportDate } from "@/lib/format"
+import { cn } from "@/lib/utils"
+import { CashAndBankAccountDto, CashBankAccountType, GlAccount } from "@/types/general-ledger"
+
+import { Badge } from "@/components/ui/badge"
+import { Button, buttonVariants } from "@/components/ui/button"
+import { Input } from "@/components/ui/input"
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
+import { Skeleton } from "@/components/ui/skeleton"
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip"
+
+type AccountTypeFilter = CashBankAccountType | "Both"
+
+export default function BankAccountsPage() {
+  const [accounts, setAccounts] = useState<CashAndBankAccountDto[] | null>(null)
+  const [glAccounts, setGlAccounts] = useState<GlAccount[] | null>(null)
+  const [error, setError] = useState<string | null>(null)
+  const [search, setSearch] = useState("")
+  const [accountType, setAccountType] = useState<AccountTypeFilter>("Both")
+
+  // GL's own server-side accountType filter (2026-07-22 rework — was client-only over one table
+  // before) — re-fetches whenever the filter changes, unlike the plain client-side search below.
+  useEffect(() => {
+    let cancelled = false
+    Promise.all([bankAccountsApi.list(accountType), glAccountsApi.list()])
+      .then(([banks, gl]) => {
+        if (cancelled) return
+        setAccounts(banks)
+        setGlAccounts(gl.items)
+      })
+      .catch((err) => {
+        if (!cancelled) setError(errorMessage(err))
+      })
+    return () => {
+      cancelled = true
+    }
+  }, [accountType])
+
+  const glAccountsById = useMemo(() => new Map((glAccounts ?? []).map((a) => [a.accountId, a])), [glAccounts])
+
+  const filtered = useMemo(() => {
+    if (!accounts) return null
+    const q = search.trim().toLowerCase()
+    if (!q) return accounts
+    return accounts.filter((a) => {
+      const gl = glAccountsById.get(a.glAccountId)
+      return (
+        a.accountName.toLowerCase().includes(q) ||
+        (a.bankName ?? "").toLowerCase().includes(q) ||
+        (a.cashAccountTypeName ?? "").toLowerCase().includes(q) ||
+        (a.accountNumber ?? "").toLowerCase().includes(q) ||
+        a.currencyCode.toLowerCase().includes(q) ||
+        (gl?.accountCode ?? "").toLowerCase().includes(q)
+      )
+    })
+  }, [accounts, search, glAccountsById])
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex items-center justify-between">
+        <div className="flex items-center gap-3">
+          <Link href="/dashboard/accounts" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
+            <ArrowLeft className="size-5" />
+          </Link>
+          <div>
+            <h1 className="text-2xl font-bold text-foreground">Cash / Bank Accounts</h1>
+            <p className="text-base text-muted-foreground">Cash and Bank accounts linked to a GL account, for reconciliation.</p>
+          </div>
+        </div>
+        <Link href="/dashboard/accounts/bank-accounts/new" className={cn(buttonVariants({ size: "lg" }))}>
+          <Plus className="size-5" />
+          New Account
+        </Link>
+      </div>
+
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-center">
+        <div className="relative flex-1">
+          <Search className="pointer-events-none absolute top-1/2 left-4 size-5 -translate-y-1/2 text-muted-foreground" />
+          <Input
+            value={search}
+            onChange={(e) => setSearch(e.target.value)}
+            placeholder="Search name, bank/type, account no. or currency…"
+            className="h-14 w-full pl-11 text-base"
+            aria-label="Search cash/bank accounts"
+          />
+        </div>
+        <Select<AccountTypeFilter> value={accountType} onValueChange={(v) => setAccountType(v ?? "Both")}>
+          <SelectTrigger className="h-14! w-full text-base sm:w-48">
+            <SelectValue />
+          </SelectTrigger>
+          <SelectContent>
+            <SelectItem value="Both" label="All types" className="text-base">All types</SelectItem>
+            <SelectItem value={CashBankAccountType.Bank} label="Bank" className="text-base">Bank</SelectItem>
+            <SelectItem value={CashBankAccountType.Cash} label="Cash" className="text-base">Cash</SelectItem>
+          </SelectContent>
+        </Select>
+      </div>
+
+      {error && (
+        <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>
+      )}
+
+      {!error && filtered === null && (
+        <div className="flex flex-col gap-3">
+          {Array.from({ length: 4 }).map((_, i) => (
+            <Skeleton key={i} className="h-14 w-full" />
+          ))}
+        </div>
+      )}
+
+      {!error && filtered !== null && filtered.length === 0 && (
+        <div className="flex flex-col items-center gap-4 rounded-xl border border-dashed py-20 text-center">
+          <Wallet className="size-12 text-muted-foreground" />
+          <p className="text-base text-muted-foreground">
+            {search ? "No accounts match your search." : "No cash/bank accounts yet."}
+          </p>
+        </div>
+      )}
+
+      {!error && filtered !== null && filtered.length > 0 && (
+        <Table className="text-base">
+          <TableHeader>
+            <TableRow>
+              <TableHead className="h-12 px-3 text-sm">Type</TableHead>
+              <TableHead className="h-12 px-3 text-sm">Account name</TableHead>
+              <TableHead className="h-12 px-3 text-sm">Bank / Cash type</TableHead>
+              <TableHead className="h-12 px-3 text-sm">Account no.</TableHead>
+              <TableHead className="h-12 px-3 text-sm">GL account</TableHead>
+              <TableHead className="h-12 px-3 text-sm">Currency</TableHead>
+              <TableHead className="h-12 px-3 text-sm">Created</TableHead>
+              <TableHead className="h-12 px-3 text-sm">Actions</TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            {filtered.map((a) => {
+              const gl = glAccountsById.get(a.glAccountId)
+              return (
+                <TableRow key={`${a.accountType}-${a.accountId}`}>
+                  <TableCell className="px-3 py-3.5">
+                    <Badge
+                      variant="outline"
+                      className={cn(
+                        "h-6 w-16 justify-center border-transparent text-sm",
+                        a.accountType === CashBankAccountType.Cash
+                          ? "bg-success/10 text-success"
+                          : "bg-primary/10 text-primary"
+                      )}
+                    >
+                      {a.accountType}
+                    </Badge>
+                  </TableCell>
+                  <TableCell className="px-3 py-3.5 font-medium">{a.accountName}</TableCell>
+                  <TableCell className="px-3 py-3.5">{a.bankName ?? a.cashAccountTypeName ?? "—"}</TableCell>
+                  <TableCell className="px-3 py-3.5">{a.accountNumber ?? "—"}</TableCell>
+                  <TableCell className="px-3 py-3.5 text-muted-foreground">
+                    {gl ? `${gl.accountCode} — ${gl.accountName}` : `#${a.glAccountId}`}
+                  </TableCell>
+                  <TableCell className="px-3 py-3.5">{a.currencyCode}</TableCell>
+                  <TableCell className="px-3 py-3.5 text-muted-foreground">{formatReportDate(a.createdAt)}</TableCell>
+                  <TableCell className="px-3 py-3.5">
+                    <Tooltip>
+                      <TooltipTrigger
+                        render={
+                          <Button variant="ghost" size="icon-sm" disabled aria-label={`Edit ${a.accountName}`} />
+                        }
+                      >
+                        <Pencil className="size-4" />
+                      </TooltipTrigger>
+                      <TooltipContent>
+                        Editing isn&apos;t available yet — the General Ledger service has no update endpoint for
+                        {a.accountType === CashBankAccountType.Cash ? " cash" : " bank"} accounts.
+                      </TooltipContent>
+                    </Tooltip>
+                  </TableCell>
+                </TableRow>
+              )
+            })}
+          </TableBody>
+        </Table>
+      )}
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/accounts/cheque-books/[chequeBookNo]/page.tsx b/Frontend/erp-system/app/dashboard/accounts/cheque-books/[chequeBookNo]/page.tsx
new file mode 100644
index 0000000..9aa9de6
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/accounts/cheque-books/[chequeBookNo]/page.tsx
@@ -0,0 +1,159 @@
+"use client"
+
+import { useEffect, useState } from "react"
+import Link from "next/link"
+import { useParams } from "next/navigation"
+import { ArrowLeft, BookText } from "lucide-react"
+
+import { bankAccountsApi, chequeBooksApi } from "@/lib/api/general-ledger"
+import { errorMessage } from "@/lib/error-map"
+import { formatAmount, formatReportDate } from "@/lib/format"
+import { cn } from "@/lib/utils"
+import { CashAndBankAccountDto, CashBankAccountType, ChequeBook, ChequePage, ChequePageIssueStatus } from "@/types/general-ledger"
+
+import { Badge } from "@/components/ui/badge"
+import { buttonVariants } from "@/components/ui/button"
+import { Skeleton } from "@/components/ui/skeleton"
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+import { ChequePageDialog } from "@/components/accounts/ChequePageDialog"
+
+const STATUS_BADGE: Record<ChequePageIssueStatus, string> = {
+  [ChequePageIssueStatus.Unused]: "bg-muted text-muted-foreground",
+  [ChequePageIssueStatus.Issued]: "bg-primary/10 text-primary",
+  [ChequePageIssueStatus.Cleared]: "bg-success/10 text-success",
+  [ChequePageIssueStatus.Bounced]: "bg-destructive/10 text-destructive",
+  [ChequePageIssueStatus.Cancelled]: "bg-destructive/10 text-destructive",
+  [ChequePageIssueStatus.Void]: "bg-muted text-muted-foreground",
+}
+
+export default function ChequeBookDetailPage() {
+  const params = useParams<{ chequeBookNo: string }>()
+  const chequeBookNo = decodeURIComponent(params.chequeBookNo)
+
+  const [book, setBook] = useState<ChequeBook | null>(null)
+  const [bankAccount, setBankAccount] = useState<CashAndBankAccountDto | null>(null)
+  const [error, setError] = useState<string | null>(null)
+  const [selectedPage, setSelectedPage] = useState<ChequePage | null>(null)
+  const [dialogOpen, setDialogOpen] = useState(false)
+
+  useEffect(() => {
+    let cancelled = false
+    chequeBooksApi
+      .get(chequeBookNo, true)
+      .then((res) => {
+        if (cancelled) return
+        setBook(res)
+        return bankAccountsApi.list(CashBankAccountType.Bank).then((banks) => {
+          if (cancelled) return
+          setBankAccount(banks.find((b) => b.accountId === res.bankAccountId) ?? null)
+        })
+      })
+      .catch((err) => {
+        if (!cancelled) setError(errorMessage(err))
+      })
+    return () => {
+      cancelled = true
+    }
+  }, [chequeBookNo])
+
+  function handlePageUpdated(updated: ChequePage) {
+    setBook((prev) => (prev ? { ...prev, pages: prev.pages.map((p) => (p.chequeNo === updated.chequeNo ? updated : p)) } : prev))
+    setSelectedPage(updated)
+  }
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex items-center gap-3">
+        <Link href="/dashboard/accounts/cheque-books" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
+          <ArrowLeft className="size-5" />
+        </Link>
+        <div>
+          <h1 className="text-2xl font-bold text-foreground">Cheque Book {chequeBookNo}</h1>
+          <p className="text-base text-muted-foreground">Every leaf in this book — click one to view details or take an action.</p>
+        </div>
+      </div>
+
+      {error && (
+        <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>
+      )}
+
+      {!error && book === null && (
+        <div className="flex flex-col gap-3">
+          {Array.from({ length: 4 }).map((_, i) => (
+            <Skeleton key={i} className="h-14 w-full" />
+          ))}
+        </div>
+      )}
+
+      {!error && book !== null && (
+        <>
+          <div className="grid grid-cols-2 gap-4 rounded-2xl bg-white p-6 shadow-sm ring-1 ring-black/5 sm:grid-cols-4">
+            <div>
+              <p className="text-sm text-muted-foreground">Bank account</p>
+              <p className="text-base font-medium">{bankAccount ? bankAccount.accountName : `#${book.bankAccountId}`}</p>
+            </div>
+            <div>
+              <p className="text-sm text-muted-foreground">Branch</p>
+              <p className="text-base font-medium">#{book.branchId}</p>
+            </div>
+            <div>
+              <p className="text-sm text-muted-foreground">Range</p>
+              <p className="text-base font-medium">
+                {book.startChequeNo} – {book.endChequeNo}
+              </p>
+            </div>
+            <div>
+              <p className="text-sm text-muted-foreground">Received</p>
+              <p className="text-base font-medium">{formatReportDate(book.receivedDate)}</p>
+            </div>
+          </div>
+
+          {book.pages.length === 0 ? (
+            <div className="flex flex-col items-center gap-4 rounded-xl border border-dashed py-20 text-center">
+              <BookText className="size-12 text-muted-foreground" />
+              <p className="text-base text-muted-foreground">No pages found for this book.</p>
+            </div>
+          ) : (
+            <Table className="text-base">
+              <TableHeader>
+                <TableRow>
+                  <TableHead className="h-12 px-3 text-sm">Cheque no.</TableHead>
+                  <TableHead className="h-12 px-3 text-sm">Status</TableHead>
+                  <TableHead className="h-12 px-3 text-sm">Payee</TableHead>
+                  <TableHead className="h-12 px-3 text-sm">Issue date</TableHead>
+                  <TableHead className="h-12 px-3 text-sm text-right">Amount</TableHead>
+                </TableRow>
+              </TableHeader>
+              <TableBody>
+                {book.pages.map((p) => (
+                  <TableRow
+                    key={p.chequeNo}
+                    className="cursor-pointer"
+                    onClick={() => {
+                      setSelectedPage(p)
+                      setDialogOpen(true)
+                    }}
+                  >
+                    <TableCell className="px-3 py-3.5 font-medium">{p.chequeNo}</TableCell>
+                    <TableCell className="px-3 py-3.5">
+                      <Badge variant="outline" className={cn("h-6 justify-center border-transparent text-sm", STATUS_BADGE[p.issueStatus])}>
+                        {p.issueStatus}
+                      </Badge>
+                    </TableCell>
+                    <TableCell className="px-3 py-3.5">{p.payeeName ?? "—"}</TableCell>
+                    <TableCell className="px-3 py-3.5 text-muted-foreground">{formatReportDate(p.issueDate)}</TableCell>
+                    <TableCell className="px-3 py-3.5 text-right tabular-nums">
+                      {p.amount !== null ? formatAmount(p.amount) : "—"}
+                    </TableCell>
+                  </TableRow>
+                ))}
+              </TableBody>
+            </Table>
+          )}
+        </>
+      )}
+
+      <ChequePageDialog page={selectedPage} open={dialogOpen} onOpenChange={setDialogOpen} onUpdated={handlePageUpdated} />
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/accounts/cheque-books/new/page.tsx b/Frontend/erp-system/app/dashboard/accounts/cheque-books/new/page.tsx
new file mode 100644
index 0000000..f910f1a
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/accounts/cheque-books/new/page.tsx
@@ -0,0 +1,216 @@
+"use client"
+
+import { useEffect, useState } from "react"
+import Link from "next/link"
+import { useRouter } from "next/navigation"
+import { ArrowLeft } from "lucide-react"
+
+import { bankAccountsApi, chequeBooksApi } from "@/lib/api/general-ledger"
+import { errorMessage } from "@/lib/error-map"
+import { validateChequeBookForm } from "@/lib/validations/general-ledger"
+import { cn } from "@/lib/utils"
+import { CashAndBankAccountDto, CashBankAccountType } from "@/types/general-ledger"
+
+import { Button, buttonVariants } from "@/components/ui/button"
+import { Field, FieldError, FieldLabel } from "@/components/ui/field"
+import { Input } from "@/components/ui/input"
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
+import { toast } from "@/components/ui/toast"
+
+export default function NewChequeBookPage() {
+  const router = useRouter()
+
+  const [bankAccounts, setBankAccounts] = useState<CashAndBankAccountDto[] | null>(null)
+  const [bankAccountsError, setBankAccountsError] = useState<string | null>(null)
+
+  const [branchId, setBranchId] = useState("")
+  const [bankAccountId, setBankAccountId] = useState("")
+  const [chequeBookNo, setChequeBookNo] = useState("")
+  const [startChequeNo, setStartChequeNo] = useState("")
+  const [endChequeNo, setEndChequeNo] = useState("")
+  const [totalLeaves, setTotalLeaves] = useState("")
+  const [receivedDate, setReceivedDate] = useState("")
+  const [description, setDescription] = useState("")
+  const [createdBy, setCreatedBy] = useState("")
+  const [errors, setErrors] = useState<Record<string, string>>({})
+  const [submitting, setSubmitting] = useState(false)
+
+  // Cheque books can only be tied to a real bank account — GL's own module note (§5.8) says
+  // statement import/reconcile, and by extension cheque books, are bank_account-only, never cash_account.
+  useEffect(() => {
+    bankAccountsApi
+      .list(CashBankAccountType.Bank)
+      .then(setBankAccounts)
+      .catch((err) => setBankAccountsError(errorMessage(err)))
+  }, [])
+
+  async function handleSubmit() {
+    const nextErrors = validateChequeBookForm({
+      branchId,
+      bankAccountId,
+      chequeBookNo,
+      startChequeNo,
+      endChequeNo,
+      totalLeaves,
+      receivedDate,
+    })
+    setErrors(nextErrors)
+    if (Object.keys(nextErrors).length > 0) return
+
+    setSubmitting(true)
+    try {
+      const created = await chequeBooksApi.create({
+        branchId: Number(branchId),
+        bankAccountId: Number(bankAccountId),
+        chequeBookNo,
+        startChequeNo,
+        endChequeNo,
+        totalLeaves: Number(totalLeaves),
+        receivedDate,
+        description: description || undefined,
+        createdBy: createdBy || undefined,
+      })
+      toast.success("Cheque book created", `${created.chequeBookNo} — ${created.totalLeaves} leaves`)
+      router.push(`/dashboard/accounts/cheque-books/${encodeURIComponent(created.chequeBookNo)}`)
+    } catch (err) {
+      toast.error("Could not create cheque book", errorMessage(err))
+    } finally {
+      setSubmitting(false)
+    }
+  }
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex items-center gap-3">
+        <Link href="/dashboard/accounts/cheque-books" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
+          <ArrowLeft className="size-5" />
+        </Link>
+        <div>
+          <h1 className="text-2xl font-bold text-foreground">New Cheque Book</h1>
+          <p className="text-base text-muted-foreground">
+            Every leaf from the start to end cheque number is generated automatically, all &quot;Unused&quot;.
+          </p>
+        </div>
+      </div>
+
+      {bankAccountsError && (
+        <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{bankAccountsError}</div>
+      )}
+
+      <div className="rounded-2xl bg-white p-6 shadow-sm ring-1 ring-black/5">
+        <div className="grid grid-cols-1 gap-x-6 gap-y-5 sm:grid-cols-2 lg:grid-cols-3">
+          <Field data-invalid={!!errors.bankAccountId}>
+            <FieldLabel htmlFor="cb-bank">Bank account</FieldLabel>
+            <Select<string> value={bankAccountId} onValueChange={(v) => setBankAccountId(v ?? "")}>
+              <SelectTrigger id="cb-bank" className="w-full text-base" aria-invalid={!!errors.bankAccountId}>
+                <SelectValue placeholder={bankAccounts === null ? "Loading…" : "Select a bank account"} />
+              </SelectTrigger>
+              <SelectContent>
+                {(bankAccounts ?? []).map((a) => (
+                  <SelectItem key={a.accountId} value={String(a.accountId)} label={a.accountName} className="text-base">
+                    {a.accountName}
+                    {a.bankName ? ` — ${a.bankName}` : ""}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+            <FieldError errors={[errors.bankAccountId ? { message: errors.bankAccountId } : undefined]} />
+          </Field>
+
+          <Field data-invalid={!!errors.branchId}>
+            <FieldLabel htmlFor="cb-branch">Branch ID</FieldLabel>
+            <Input
+              id="cb-branch"
+              type="number"
+              value={branchId}
+              onChange={(e) => setBranchId(e.target.value)}
+              placeholder="1"
+              aria-invalid={!!errors.branchId}
+            />
+            <FieldError errors={[errors.branchId ? { message: errors.branchId } : undefined]} />
+          </Field>
+
+          <Field data-invalid={!!errors.chequeBookNo}>
+            <FieldLabel htmlFor="cb-no">Cheque book number</FieldLabel>
+            <Input
+              id="cb-no"
+              value={chequeBookNo}
+              onChange={(e) => setChequeBookNo(e.target.value)}
+              placeholder="CB-0001"
+              aria-invalid={!!errors.chequeBookNo}
+            />
+            <FieldError errors={[errors.chequeBookNo ? { message: errors.chequeBookNo } : undefined]} />
+          </Field>
+
+          <Field data-invalid={!!errors.startChequeNo}>
+            <FieldLabel htmlFor="cb-start">Start cheque no.</FieldLabel>
+            <Input
+              id="cb-start"
+              value={startChequeNo}
+              onChange={(e) => setStartChequeNo(e.target.value)}
+              placeholder="000001"
+              aria-invalid={!!errors.startChequeNo}
+            />
+            <FieldError errors={[errors.startChequeNo ? { message: errors.startChequeNo } : undefined]} />
+          </Field>
+          <Field data-invalid={!!errors.endChequeNo}>
+            <FieldLabel htmlFor="cb-end">End cheque no.</FieldLabel>
+            <Input
+              id="cb-end"
+              value={endChequeNo}
+              onChange={(e) => setEndChequeNo(e.target.value)}
+              placeholder="000025"
+              aria-invalid={!!errors.endChequeNo}
+            />
+            <FieldError errors={[errors.endChequeNo ? { message: errors.endChequeNo } : undefined]} />
+          </Field>
+
+          <Field data-invalid={!!errors.totalLeaves}>
+            <FieldLabel htmlFor="cb-leaves">Total leaves</FieldLabel>
+            <Input
+              id="cb-leaves"
+              type="number"
+              value={totalLeaves}
+              onChange={(e) => setTotalLeaves(e.target.value)}
+              placeholder="25"
+              aria-invalid={!!errors.totalLeaves}
+            />
+            <p className="text-sm text-muted-foreground">Must equal end − start + 1.</p>
+            <FieldError errors={[errors.totalLeaves ? { message: errors.totalLeaves } : undefined]} />
+          </Field>
+
+          <Field data-invalid={!!errors.receivedDate}>
+            <FieldLabel htmlFor="cb-received">Received date</FieldLabel>
+            <Input
+              id="cb-received"
+              type="date"
+              value={receivedDate}
+              onChange={(e) => setReceivedDate(e.target.value)}
+              aria-invalid={!!errors.receivedDate}
+            />
+            <FieldError errors={[errors.receivedDate ? { message: errors.receivedDate } : undefined]} />
+          </Field>
+
+          <Field>
+            <FieldLabel htmlFor="cb-desc">Description (optional)</FieldLabel>
+            <Input id="cb-desc" value={description} onChange={(e) => setDescription(e.target.value)} />
+          </Field>
+
+          <Field>
+            <FieldLabel htmlFor="cb-by">Created by (optional)</FieldLabel>
+            <Input id="cb-by" value={createdBy} onChange={(e) => setCreatedBy(e.target.value)} />
+          </Field>
+        </div>
+
+        <div className="mt-6 flex justify-end gap-3">
+          <Link href="/dashboard/accounts/cheque-books" className={cn(buttonVariants({ variant: "outline" }), "min-w-36")}>
+            Cancel
+          </Link>
+          <Button className="min-w-36" onClick={handleSubmit} disabled={submitting}>
+            {submitting ? "Creating…" : "Create"}
+          </Button>
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/accounts/cheque-books/page.tsx b/Frontend/erp-system/app/dashboard/accounts/cheque-books/page.tsx
new file mode 100644
index 0000000..c925ddb
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/accounts/cheque-books/page.tsx
@@ -0,0 +1,154 @@
+"use client"
+
+import { useEffect, useMemo, useState } from "react"
+import Link from "next/link"
+import { useRouter } from "next/navigation"
+import { ArrowLeft, BookText, Plus } from "lucide-react"
+
+import { bankAccountsApi, chequeBooksApi } from "@/lib/api/general-ledger"
+import { errorMessage } from "@/lib/error-map"
+import { formatReportDate } from "@/lib/format"
+import { cn } from "@/lib/utils"
+import { CashAndBankAccountDto, CashBankAccountType, ChequeBook, ChequeBookStatus } from "@/types/general-ledger"
+
+import { Badge } from "@/components/ui/badge"
+import { buttonVariants } from "@/components/ui/button"
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
+import { Skeleton } from "@/components/ui/skeleton"
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+
+type StatusFilter = ChequeBookStatus | "All"
+
+const STATUS_BADGE: Record<ChequeBookStatus, string> = {
+  [ChequeBookStatus.Active]: "bg-success/10 text-success",
+  [ChequeBookStatus.Completed]: "bg-primary/10 text-primary",
+  [ChequeBookStatus.Cancelled]: "bg-destructive/10 text-destructive",
+}
+
+export default function ChequeBooksPage() {
+  const router = useRouter()
+  const [books, setBooks] = useState<ChequeBook[] | null>(null)
+  const [bankAccounts, setBankAccounts] = useState<CashAndBankAccountDto[] | null>(null)
+  const [error, setError] = useState<string | null>(null)
+  const [status, setStatus] = useState<StatusFilter>("All")
+
+  useEffect(() => {
+    let cancelled = false
+    Promise.all([
+      chequeBooksApi.list(status === "All" ? undefined : { status }),
+      bankAccounts ? Promise.resolve(bankAccounts) : bankAccountsApi.list(CashBankAccountType.Bank),
+    ])
+      .then(([result, banks]) => {
+        if (cancelled) return
+        setBooks(result.items)
+        setBankAccounts(banks)
+      })
+      .catch((err) => {
+        if (!cancelled) setError(errorMessage(err))
+      })
+    return () => {
+      cancelled = true
+    }
+    // bankAccounts intentionally excluded — fetched once, reused across status re-fetches.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [status])
+
+  const bankAccountsById = useMemo(() => new Map((bankAccounts ?? []).map((a) => [a.accountId, a])), [bankAccounts])
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex items-center justify-between">
+        <div className="flex items-center gap-3">
+          <Link href="/dashboard/accounts" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
+            <ArrowLeft className="size-5" />
+          </Link>
+          <div>
+            <h1 className="text-2xl font-bold text-foreground">Cheque Books</h1>
+            <p className="text-base text-muted-foreground">Cheque books issued from this company&apos;s own supply.</p>
+          </div>
+        </div>
+        <Link href="/dashboard/accounts/cheque-books/new" className={cn(buttonVariants({ size: "lg" }))}>
+          <Plus className="size-5" />
+          New Cheque Book
+        </Link>
+      </div>
+
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-center">
+        <Select<StatusFilter> value={status} onValueChange={(v) => setStatus(v ?? "All")}>
+          <SelectTrigger className="h-12! w-full text-base sm:w-48">
+            <SelectValue />
+          </SelectTrigger>
+          <SelectContent>
+            <SelectItem value="All" label="All statuses" className="text-base">All statuses</SelectItem>
+            <SelectItem value={ChequeBookStatus.Active} label="Active" className="text-base">Active</SelectItem>
+            <SelectItem value={ChequeBookStatus.Completed} label="Completed" className="text-base">Completed</SelectItem>
+            <SelectItem value={ChequeBookStatus.Cancelled} label="Cancelled" className="text-base">Cancelled</SelectItem>
+          </SelectContent>
+        </Select>
+      </div>
+
+      {error && (
+        <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>
+      )}
+
+      {!error && books === null && (
+        <div className="flex flex-col gap-3">
+          {Array.from({ length: 4 }).map((_, i) => (
+            <Skeleton key={i} className="h-14 w-full" />
+          ))}
+        </div>
+      )}
+
+      {!error && books !== null && books.length === 0 && (
+        <div className="flex flex-col items-center gap-4 rounded-xl border border-dashed py-20 text-center">
+          <BookText className="size-12 text-muted-foreground" />
+          <p className="text-base text-muted-foreground">No cheque books yet.</p>
+        </div>
+      )}
+
+      {!error && books !== null && books.length > 0 && (
+        <Table className="text-base">
+          <TableHeader>
+            <TableRow>
+              <TableHead className="h-12 px-3 text-sm">Cheque book no.</TableHead>
+              <TableHead className="h-12 px-3 text-sm">Bank account</TableHead>
+              <TableHead className="h-12 px-3 text-sm">Branch</TableHead>
+              <TableHead className="h-12 px-3 text-sm">Range</TableHead>
+              <TableHead className="h-12 px-3 text-sm">Leaves</TableHead>
+              <TableHead className="h-12 px-3 text-sm">Received</TableHead>
+              <TableHead className="h-12 px-3 text-sm">Status</TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            {books.map((b) => {
+              const bank = bankAccountsById.get(b.bankAccountId)
+              return (
+                <TableRow
+                  key={b.chequeBookNo}
+                  className="cursor-pointer"
+                  onClick={() => router.push(`/dashboard/accounts/cheque-books/${encodeURIComponent(b.chequeBookNo)}`)}
+                >
+                  <TableCell className="px-3 py-3.5 font-medium">{b.chequeBookNo}</TableCell>
+                  <TableCell className="px-3 py-3.5 text-muted-foreground">
+                    {bank ? bank.accountName : `#${b.bankAccountId}`}
+                  </TableCell>
+                  <TableCell className="px-3 py-3.5 text-muted-foreground">#{b.branchId}</TableCell>
+                  <TableCell className="px-3 py-3.5">
+                    {b.startChequeNo} – {b.endChequeNo}
+                  </TableCell>
+                  <TableCell className="px-3 py-3.5">{b.totalLeaves}</TableCell>
+                  <TableCell className="px-3 py-3.5 text-muted-foreground">{formatReportDate(b.receivedDate)}</TableCell>
+                  <TableCell className="px-3 py-3.5">
+                    <Badge variant="outline" className={cn("h-6 justify-center border-transparent text-sm", STATUS_BADGE[b.status])}>
+                      {b.status}
+                    </Badge>
+                  </TableCell>
+                </TableRow>
+              )
+            })}
+          </TableBody>
+        </Table>
+      )}
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/accounts/page.tsx b/Frontend/erp-system/app/dashboard/accounts/page.tsx
new file mode 100644
index 0000000..34e7de5
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/accounts/page.tsx
@@ -0,0 +1,58 @@
+import Link from "next/link"
+import { BookText, Inbox, Wallet, type LucideIcon } from "lucide-react"
+
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
+
+const areas: { title: string; description: string; href: string; icon: LucideIcon }[] = [
+  {
+    title: "Cash / Bank Accounts",
+    description: "Cash and Bank accounts linked to a GL account — list, create, and reconcile against them.",
+    href: "/dashboard/accounts/bank-accounts",
+    icon: Wallet,
+  },
+  {
+    title: "Cheque Books",
+    description: "Cheque books issued from this company’s own supply — issue, clear, bounce, cancel or void a leaf.",
+    href: "/dashboard/accounts/cheque-books",
+    icon: BookText,
+  },
+  {
+    title: "Received Cheques",
+    description: "Cheques received from customers/suppliers — deposit, clear, return, or cancel.",
+    href: "/dashboard/accounts/received-cheques",
+    icon: Inbox,
+  },
+]
+
+export default function AccountsHubPage() {
+  return (
+    <div className="flex flex-col gap-6">
+      <div>
+        <h1 className="text-2xl font-bold text-foreground">Accounts</h1>
+        <p className="text-base text-muted-foreground">
+          Cash/Bank accounts and cheque management, from the General Ledger service.
+        </p>
+      </div>
+
+      <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 xl:grid-cols-3">
+        {areas.map((area) => (
+          <Link key={area.href} href={area.href}>
+            <Card className="h-full transition-shadow hover:shadow-md">
+              <CardHeader>
+                <div className="flex items-center gap-3">
+                  <div className="flex size-11 shrink-0 items-center justify-center rounded-xl bg-primary/10 text-primary">
+                    <area.icon className="size-5" />
+                  </div>
+                  <CardTitle className="text-lg">{area.title}</CardTitle>
+                </div>
+              </CardHeader>
+              <CardContent>
+                <p className="text-base text-muted-foreground">{area.description}</p>
+              </CardContent>
+            </Card>
+          </Link>
+        ))}
+      </div>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/accounts/received-cheques/new/page.tsx b/Frontend/erp-system/app/dashboard/accounts/received-cheques/new/page.tsx
new file mode 100644
index 0000000..49684d4
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/accounts/received-cheques/new/page.tsx
@@ -0,0 +1,215 @@
+"use client"
+
+import { useState } from "react"
+import Link from "next/link"
+import { useRouter } from "next/navigation"
+import { ArrowLeft } from "lucide-react"
+
+import { receivedChequesApi } from "@/lib/api/general-ledger"
+import { errorMessage } from "@/lib/error-map"
+import { validateReceivedChequeForm } from "@/lib/validations/general-ledger"
+import { cn } from "@/lib/utils"
+import { ReceivedFromType } from "@/types/general-ledger"
+
+import { Button, buttonVariants } from "@/components/ui/button"
+import { Field, FieldError, FieldLabel } from "@/components/ui/field"
+import { Input } from "@/components/ui/input"
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
+import { toast } from "@/components/ui/toast"
+
+export default function NewReceivedChequePage() {
+  const router = useRouter()
+
+  const [companyId, setCompanyId] = useState("")
+  const [branchId, setBranchId] = useState("")
+  const [receivedFromType, setReceivedFromType] = useState<ReceivedFromType>(ReceivedFromType.Customer)
+  const [receivedFromId, setReceivedFromId] = useState("")
+  const [receivedFromName, setReceivedFromName] = useState("")
+  const [drawerBankName, setDrawerBankName] = useState("")
+  const [drawerBankBranch, setDrawerBankBranch] = useState("")
+  const [accountHolderName, setAccountHolderName] = useState("")
+  const [chequeNo, setChequeNo] = useState("")
+  const [chequeDate, setChequeDate] = useState("")
+  const [amount, setAmount] = useState("")
+  const [receivedDate, setReceivedDate] = useState("")
+  const [referenceType, setReferenceType] = useState("")
+  const [referenceId, setReferenceId] = useState("")
+  const [notes, setNotes] = useState("")
+  const [createdBy, setCreatedBy] = useState("")
+  const [errors, setErrors] = useState<Record<string, string>>({})
+  const [submitting, setSubmitting] = useState(false)
+
+  async function handleSubmit() {
+    const nextErrors = validateReceivedChequeForm({ companyId, receivedFromName, chequeNo, chequeDate, amount, receivedDate })
+    setErrors(nextErrors)
+    if (Object.keys(nextErrors).length > 0) return
+
+    setSubmitting(true)
+    try {
+      const created = await receivedChequesApi.create({
+        companyId: Number(companyId),
+        branchId: branchId ? Number(branchId) : undefined,
+        receivedFromType,
+        receivedFromId: receivedFromId ? Number(receivedFromId) : undefined,
+        receivedFromName,
+        drawerBankName: drawerBankName || undefined,
+        drawerBankBranch: drawerBankBranch || undefined,
+        accountHolderName: accountHolderName || undefined,
+        chequeNo,
+        chequeDate,
+        amount: Number(amount),
+        receivedDate,
+        referenceType: referenceType || undefined,
+        referenceId: referenceId ? Number(referenceId) : undefined,
+        notes: notes || undefined,
+        createdBy: createdBy || undefined,
+      })
+      toast.success("Received cheque recorded", `${created.chequeNo} — ${created.receivedFromName}`)
+      router.push("/dashboard/accounts/received-cheques")
+    } catch (err) {
+      toast.error("Could not record received cheque", errorMessage(err))
+    } finally {
+      setSubmitting(false)
+    }
+  }
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex items-center gap-3">
+        <Link href="/dashboard/accounts/received-cheques" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
+          <ArrowLeft className="size-5" />
+        </Link>
+        <div>
+          <h1 className="text-2xl font-bold text-foreground">New Received Cheque</h1>
+          <p className="text-base text-muted-foreground">Record a cheque received from a customer, supplier, or other party.</p>
+        </div>
+      </div>
+
+      <div className="rounded-2xl bg-white p-6 shadow-sm ring-1 ring-black/5">
+        <div className="grid grid-cols-1 gap-x-6 gap-y-5 sm:grid-cols-2 lg:grid-cols-3">
+          <Field data-invalid={!!errors.companyId}>
+            <FieldLabel htmlFor="rc-company">Company ID</FieldLabel>
+            <Input
+              id="rc-company"
+              type="number"
+              value={companyId}
+              onChange={(e) => setCompanyId(e.target.value)}
+              placeholder="1"
+              aria-invalid={!!errors.companyId}
+            />
+            <FieldError errors={[errors.companyId ? { message: errors.companyId } : undefined]} />
+          </Field>
+          <Field>
+            <FieldLabel htmlFor="rc-branch">Branch ID (optional)</FieldLabel>
+            <Input id="rc-branch" type="number" value={branchId} onChange={(e) => setBranchId(e.target.value)} />
+          </Field>
+
+          <Field>
+            <FieldLabel htmlFor="rc-from-type">Received from type</FieldLabel>
+            <Select<ReceivedFromType> value={receivedFromType} onValueChange={(v) => setReceivedFromType(v ?? ReceivedFromType.Customer)}>
+              <SelectTrigger id="rc-from-type" className="w-full text-base">
+                <SelectValue />
+              </SelectTrigger>
+              <SelectContent>
+                {Object.values(ReceivedFromType).map((t) => (
+                  <SelectItem key={t} value={t} label={t} className="text-base">
+                    {t}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+          </Field>
+
+          <Field data-invalid={!!errors.receivedFromName}>
+            <FieldLabel htmlFor="rc-from-name">Received from name</FieldLabel>
+            <Input
+              id="rc-from-name"
+              value={receivedFromName}
+              onChange={(e) => setReceivedFromName(e.target.value)}
+              aria-invalid={!!errors.receivedFromName}
+            />
+            <FieldError errors={[errors.receivedFromName ? { message: errors.receivedFromName } : undefined]} />
+          </Field>
+          <Field>
+            <FieldLabel htmlFor="rc-from-id">Received from ID (optional)</FieldLabel>
+            <Input id="rc-from-id" type="number" value={receivedFromId} onChange={(e) => setReceivedFromId(e.target.value)} />
+          </Field>
+
+          <Field>
+            <FieldLabel htmlFor="rc-drawer-bank">Drawer bank (optional)</FieldLabel>
+            <Input id="rc-drawer-bank" value={drawerBankName} onChange={(e) => setDrawerBankName(e.target.value)} />
+          </Field>
+          <Field>
+            <FieldLabel htmlFor="rc-drawer-branch">Drawer branch (optional)</FieldLabel>
+            <Input id="rc-drawer-branch" value={drawerBankBranch} onChange={(e) => setDrawerBankBranch(e.target.value)} />
+          </Field>
+          <Field>
+            <FieldLabel htmlFor="rc-holder">Account holder name (optional)</FieldLabel>
+            <Input id="rc-holder" value={accountHolderName} onChange={(e) => setAccountHolderName(e.target.value)} />
+          </Field>
+
+          <Field data-invalid={!!errors.chequeNo}>
+            <FieldLabel htmlFor="rc-cheque-no">Cheque number</FieldLabel>
+            <Input id="rc-cheque-no" value={chequeNo} onChange={(e) => setChequeNo(e.target.value)} aria-invalid={!!errors.chequeNo} />
+            <FieldError errors={[errors.chequeNo ? { message: errors.chequeNo } : undefined]} />
+          </Field>
+          <Field data-invalid={!!errors.chequeDate}>
+            <FieldLabel htmlFor="rc-cheque-date">Cheque date</FieldLabel>
+            <Input
+              id="rc-cheque-date"
+              type="date"
+              value={chequeDate}
+              onChange={(e) => setChequeDate(e.target.value)}
+              aria-invalid={!!errors.chequeDate}
+            />
+            <FieldError errors={[errors.chequeDate ? { message: errors.chequeDate } : undefined]} />
+          </Field>
+
+          <Field data-invalid={!!errors.amount}>
+            <FieldLabel htmlFor="rc-amount">Amount</FieldLabel>
+            <Input id="rc-amount" type="number" value={amount} onChange={(e) => setAmount(e.target.value)} aria-invalid={!!errors.amount} />
+            <FieldError errors={[errors.amount ? { message: errors.amount } : undefined]} />
+          </Field>
+          <Field data-invalid={!!errors.receivedDate}>
+            <FieldLabel htmlFor="rc-received-date">Received date</FieldLabel>
+            <Input
+              id="rc-received-date"
+              type="date"
+              value={receivedDate}
+              onChange={(e) => setReceivedDate(e.target.value)}
+              aria-invalid={!!errors.receivedDate}
+            />
+            <FieldError errors={[errors.receivedDate ? { message: errors.receivedDate } : undefined]} />
+          </Field>
+
+          <Field>
+            <FieldLabel htmlFor="rc-ref-type">Reference type (optional)</FieldLabel>
+            <Input id="rc-ref-type" value={referenceType} onChange={(e) => setReferenceType(e.target.value)} placeholder="Invoice" />
+          </Field>
+          <Field>
+            <FieldLabel htmlFor="rc-ref-id">Reference ID (optional)</FieldLabel>
+            <Input id="rc-ref-id" type="number" value={referenceId} onChange={(e) => setReferenceId(e.target.value)} />
+          </Field>
+
+          <Field>
+            <FieldLabel htmlFor="rc-notes">Notes (optional)</FieldLabel>
+            <Input id="rc-notes" value={notes} onChange={(e) => setNotes(e.target.value)} />
+          </Field>
+          <Field>
+            <FieldLabel htmlFor="rc-created-by">Created by (optional)</FieldLabel>
+            <Input id="rc-created-by" value={createdBy} onChange={(e) => setCreatedBy(e.target.value)} />
+          </Field>
+        </div>
+
+        <div className="mt-6 flex justify-end gap-3">
+          <Link href="/dashboard/accounts/received-cheques" className={cn(buttonVariants({ variant: "outline" }), "min-w-36")}>
+            Cancel
+          </Link>
+          <Button className="min-w-36" onClick={handleSubmit} disabled={submitting}>
+            {submitting ? "Recording…" : "Record"}
+          </Button>
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/accounts/received-cheques/page.tsx b/Frontend/erp-system/app/dashboard/accounts/received-cheques/page.tsx
new file mode 100644
index 0000000..d66699e
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/accounts/received-cheques/page.tsx
@@ -0,0 +1,151 @@
+"use client"
+
+import { useEffect, useState } from "react"
+import Link from "next/link"
+import { ArrowLeft, Inbox, Plus } from "lucide-react"
+
+import { receivedChequesApi } from "@/lib/api/general-ledger"
+import { errorMessage } from "@/lib/error-map"
+import { formatAmount, formatReportDate } from "@/lib/format"
+import { cn } from "@/lib/utils"
+import { ReceivedCheque, ReceivedChequeStatus } from "@/types/general-ledger"
+
+import { Badge } from "@/components/ui/badge"
+import { buttonVariants } from "@/components/ui/button"
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
+import { Skeleton } from "@/components/ui/skeleton"
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+import { ReceivedChequeDialog } from "@/components/accounts/ReceivedChequeDialog"
+
+type StatusFilter = ReceivedChequeStatus | "All"
+
+const STATUS_BADGE: Record<ReceivedChequeStatus, string> = {
+  [ReceivedChequeStatus.Received]: "bg-muted text-muted-foreground",
+  [ReceivedChequeStatus.Deposited]: "bg-primary/10 text-primary",
+  [ReceivedChequeStatus.Cleared]: "bg-success/10 text-success",
+  [ReceivedChequeStatus.Returned]: "bg-destructive/10 text-destructive",
+  [ReceivedChequeStatus.Cancelled]: "bg-destructive/10 text-destructive",
+}
+
+export default function ReceivedChequesPage() {
+  const [cheques, setCheques] = useState<ReceivedCheque[] | null>(null)
+  const [error, setError] = useState<string | null>(null)
+  const [status, setStatus] = useState<StatusFilter>("All")
+  const [selected, setSelected] = useState<ReceivedCheque | null>(null)
+  const [dialogOpen, setDialogOpen] = useState(false)
+
+  useEffect(() => {
+    let cancelled = false
+    receivedChequesApi
+      .list(status === "All" ? undefined : { status })
+      .then((res) => {
+        if (!cancelled) setCheques(res.items)
+      })
+      .catch((err) => {
+        if (!cancelled) setError(errorMessage(err))
+      })
+    return () => {
+      cancelled = true
+    }
+  }, [status])
+
+  function handleUpdated(updated: ReceivedCheque) {
+    setCheques((prev) => (prev ? prev.map((c) => (c.receivedChequeId === updated.receivedChequeId ? updated : c)) : prev))
+    setSelected(updated)
+  }
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex items-center justify-between">
+        <div className="flex items-center gap-3">
+          <Link href="/dashboard/accounts" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
+            <ArrowLeft className="size-5" />
+          </Link>
+          <div>
+            <h1 className="text-2xl font-bold text-foreground">Received Cheques</h1>
+            <p className="text-base text-muted-foreground">Cheques received from customers, suppliers, or others.</p>
+          </div>
+        </div>
+        <Link href="/dashboard/accounts/received-cheques/new" className={cn(buttonVariants({ size: "lg" }))}>
+          <Plus className="size-5" />
+          New Received Cheque
+        </Link>
+      </div>
+
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-center">
+        <Select<StatusFilter> value={status} onValueChange={(v) => setStatus(v ?? "All")}>
+          <SelectTrigger className="h-12! w-full text-base sm:w-48">
+            <SelectValue />
+          </SelectTrigger>
+          <SelectContent>
+            <SelectItem value="All" label="All statuses" className="text-base">All statuses</SelectItem>
+            <SelectItem value={ReceivedChequeStatus.Received} label="Received" className="text-base">Received</SelectItem>
+            <SelectItem value={ReceivedChequeStatus.Deposited} label="Deposited" className="text-base">Deposited</SelectItem>
+            <SelectItem value={ReceivedChequeStatus.Cleared} label="Cleared" className="text-base">Cleared</SelectItem>
+            <SelectItem value={ReceivedChequeStatus.Returned} label="Returned" className="text-base">Returned</SelectItem>
+            <SelectItem value={ReceivedChequeStatus.Cancelled} label="Cancelled" className="text-base">Cancelled</SelectItem>
+          </SelectContent>
+        </Select>
+      </div>
+
+      {error && (
+        <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>
+      )}
+
+      {!error && cheques === null && (
+        <div className="flex flex-col gap-3">
+          {Array.from({ length: 4 }).map((_, i) => (
+            <Skeleton key={i} className="h-14 w-full" />
+          ))}
+        </div>
+      )}
+
+      {!error && cheques !== null && cheques.length === 0 && (
+        <div className="flex flex-col items-center gap-4 rounded-xl border border-dashed py-20 text-center">
+          <Inbox className="size-12 text-muted-foreground" />
+          <p className="text-base text-muted-foreground">No received cheques yet.</p>
+        </div>
+      )}
+
+      {!error && cheques !== null && cheques.length > 0 && (
+        <Table className="text-base">
+          <TableHeader>
+            <TableRow>
+              <TableHead className="h-12 px-3 text-sm">Cheque no.</TableHead>
+              <TableHead className="h-12 px-3 text-sm">Received from</TableHead>
+              <TableHead className="h-12 px-3 text-sm">Type</TableHead>
+              <TableHead className="h-12 px-3 text-sm text-right">Amount</TableHead>
+              <TableHead className="h-12 px-3 text-sm">Received</TableHead>
+              <TableHead className="h-12 px-3 text-sm">Status</TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            {cheques.map((c) => (
+              <TableRow
+                key={c.receivedChequeId}
+                className="cursor-pointer"
+                onClick={() => {
+                  setSelected(c)
+                  setDialogOpen(true)
+                }}
+              >
+                <TableCell className="px-3 py-3.5 font-medium">{c.chequeNo}</TableCell>
+                <TableCell className="px-3 py-3.5">{c.receivedFromName}</TableCell>
+                <TableCell className="px-3 py-3.5 text-muted-foreground">{c.receivedFromType}</TableCell>
+                <TableCell className="px-3 py-3.5 text-right tabular-nums">{formatAmount(c.amount)}</TableCell>
+                <TableCell className="px-3 py-3.5 text-muted-foreground">{formatReportDate(c.receivedDate)}</TableCell>
+                <TableCell className="px-3 py-3.5">
+                  <Badge variant="outline" className={cn("h-6 justify-center border-transparent text-sm", STATUS_BADGE[c.status])}>
+                    {c.status}
+                  </Badge>
+                </TableCell>
+              </TableRow>
+            ))}
+          </TableBody>
+        </Table>
+      )}
+
+      <ReceivedChequeDialog cheque={selected} open={dialogOpen} onOpenChange={setDialogOpen} onUpdated={handleUpdated} />
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/ledgers/balance-sheet/page.tsx b/Frontend/erp-system/app/dashboard/ledgers/balance-sheet/page.tsx
new file mode 100644
index 0000000..d835278
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/ledgers/balance-sheet/page.tsx
@@ -0,0 +1,156 @@
+"use client"
+
+import { useEffect, useState } from "react"
+import Link from "next/link"
+import { ArrowLeft, Landmark } from "lucide-react"
+
+import { reportsApi } from "@/lib/api/general-ledger"
+import { errorMessage } from "@/lib/error-map"
+import { formatReportDate, todayIso } from "@/lib/format"
+import { cn } from "@/lib/utils"
+import { BalanceSheetResponse, BalanceSheetSection, ReportType } from "@/types/general-ledger"
+
+import { buttonVariants } from "@/components/ui/button"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { Skeleton } from "@/components/ui/skeleton"
+import { DownloadCsvButton } from "@/components/reports/DownloadCsvButton"
+import { DownloadPdfButton } from "@/components/reports/DownloadPdfButton"
+import { ReportHeader } from "@/components/reports/ReportHeader"
+import { ReportSection, ReportSectionLine } from "@/components/reports/ReportSection"
+import { ReportSubtotal } from "@/components/reports/ReportSubtotal"
+
+// GL's leaf rows carry `accountCode` too, but a classified Statement of Financial Position
+// (matching the reference template this screen follows) shows plain line-item names only, no
+// codes — same convention as the Balance Sheet's account-code-free presentation elsewhere.
+function sectionLines(section?: BalanceSheetSection): ReportSectionLine[] {
+  return (section?.lines ?? []).map((l) => ({ label: l.accountName, amount: l.balance }))
+}
+
+export default function BalanceSheetPage() {
+  const [asOfDate, setAsOfDate] = useState(todayIso())
+  const [report, setReport] = useState<BalanceSheetResponse | null>(null)
+  const [error, setError] = useState<string | null>(null)
+
+  // Clears stale results the instant asOfDate changes, during the render that reacts to it —
+  // not inside the effect below, which would be a synchronous setState-in-effect
+  // (react-hooks/set-state-in-effect); this is React's own sanctioned "adjust state during
+  // render" pattern instead.
+  const [loadedFor, setLoadedFor] = useState<string | null>(null)
+  if (loadedFor !== asOfDate) {
+    setLoadedFor(asOfDate)
+    setReport(null)
+    setError(null)
+  }
+
+  useEffect(() => {
+    if (!asOfDate) return
+    let cancelled = false
+    reportsApi
+      .balanceSheet(asOfDate)
+      .then((res) => {
+        if (!cancelled) setReport(res)
+      })
+      .catch((err) => {
+        if (!cancelled) setError(errorMessage(err))
+      })
+    return () => {
+      cancelled = true
+    }
+  }, [asOfDate])
+
+  const isEmpty =
+    report !== null &&
+    (report.nonCurrentAssets?.lines?.length ?? 0) === 0 &&
+    (report.currentAssets?.lines?.length ?? 0) === 0 &&
+    (report.unclassifiedAssets?.lines?.length ?? 0) === 0 &&
+    (report.equity?.lines?.length ?? 0) === 0 &&
+    (report.nonCurrentLiabilities?.lines?.length ?? 0) === 0 &&
+    (report.currentLiabilities?.lines?.length ?? 0) === 0 &&
+    (report.unclassifiedLiabilities?.lines?.length ?? 0) === 0
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex items-center gap-3">
+        <Link href="/dashboard/ledgers" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
+          <ArrowLeft className="size-5" />
+        </Link>
+        <div>
+          <h1 className="text-2xl font-bold text-foreground">Balance Sheet</h1>
+          <p className="text-base text-muted-foreground">Statement of Financial Position — Assets, Liabilities, Equity.</p>
+        </div>
+      </div>
+
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-end sm:justify-between">
+        <div className="flex flex-col gap-1.5">
+          <Label className="text-base">As at</Label>
+          <Input type="date" value={asOfDate} onChange={(e) => setAsOfDate(e.target.value)} className="h-11 w-full text-base sm:w-60" />
+        </div>
+        <div className="flex gap-2">
+          <DownloadPdfButton reportType={ReportType.BalanceSheet} params={{ asOfDate }} disabled={!report} />
+          <DownloadCsvButton reportType={ReportType.BalanceSheet} params={{ asOfDate }} disabled={!report} />
+        </div>
+      </div>
+
+      {error && (
+        <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>
+      )}
+
+      {!error && report === null && (
+        <div className="flex flex-col gap-3">
+          {Array.from({ length: 6 }).map((_, i) => (
+            <Skeleton key={i} className="h-12 w-full" />
+          ))}
+        </div>
+      )}
+
+      {!error && isEmpty && (
+        <div className="flex flex-col items-center gap-4 rounded-xl border border-dashed py-20 text-center">
+          <Landmark className="size-12 text-muted-foreground" />
+          <p className="text-base text-muted-foreground">No Asset/Liability/Equity accounts as at this date.</p>
+        </div>
+      )}
+
+      {!error && report !== null && !isEmpty && (
+        <div className="rounded-2xl bg-white p-6 shadow-sm ring-1 ring-black/5">
+          <ReportHeader title="Statement of Financial Position" subtitle={`As at ${formatReportDate(asOfDate)}`} />
+
+          <div className="mt-4">
+            <p className="mb-2 text-sm font-bold tracking-wide text-foreground uppercase">Assets</p>
+            <ReportSection
+              title="Non-Current Assets"
+              lines={sectionLines(report.nonCurrentAssets)}
+              total={report.nonCurrentAssets?.total}
+            />
+            <ReportSection title="Current Assets" lines={sectionLines(report.currentAssets)} total={report.currentAssets?.total} />
+            <ReportSection
+              title="Unclassified Assets"
+              lines={sectionLines(report.unclassifiedAssets)}
+              total={report.unclassifiedAssets?.total}
+            />
+            <ReportSubtotal label="Total Assets" amount={report.totalAssets} large />
+
+            <p className="mt-6 mb-2 text-sm font-bold tracking-wide text-foreground uppercase">Equity and Liabilities</p>
+            <ReportSection title="Equity" lines={sectionLines(report.equity)} total={report.equity?.total} />
+            <ReportSection
+              title="Non-Current Liabilities"
+              lines={sectionLines(report.nonCurrentLiabilities)}
+              total={report.nonCurrentLiabilities?.total}
+            />
+            <ReportSection
+              title="Current Liabilities"
+              lines={sectionLines(report.currentLiabilities)}
+              total={report.currentLiabilities?.total}
+            />
+            <ReportSection
+              title="Unclassified Liabilities"
+              lines={sectionLines(report.unclassifiedLiabilities)}
+              total={report.unclassifiedLiabilities?.total}
+            />
+            <ReportSubtotal label="Total Equity and Liabilities" amount={report.totalEquityAndLiabilities} large />
+          </div>
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/ledgers/budget-vs-actual/page.tsx b/Frontend/erp-system/app/dashboard/ledgers/budget-vs-actual/page.tsx
new file mode 100644
index 0000000..fc51fd2
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/ledgers/budget-vs-actual/page.tsx
@@ -0,0 +1,179 @@
+"use client"
+
+import { useEffect, useMemo, useState } from "react"
+import Link from "next/link"
+import { ArrowLeft, BadgeDollarSign } from "lucide-react"
+
+import { glBudgetsApi, reportsApi } from "@/lib/api/general-ledger"
+import { errorMessage } from "@/lib/error-map"
+import { formatAmount } from "@/lib/format"
+import { cn } from "@/lib/utils"
+import { BudgetVsActualRow, GlBudget, ReportType } from "@/types/general-ledger"
+
+import { buttonVariants } from "@/components/ui/button"
+import { Label } from "@/components/ui/label"
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
+import { Skeleton } from "@/components/ui/skeleton"
+import { Table, TableBody, TableCell, TableFooter, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+import { DownloadCsvButton } from "@/components/reports/DownloadCsvButton"
+import { DownloadPdfButton } from "@/components/reports/DownloadPdfButton"
+import { ReportHeader } from "@/components/reports/ReportHeader"
+
+export default function BudgetVsActualPage() {
+  const [budgets, setBudgets] = useState<GlBudget[] | null>(null)
+  const [budgetsError, setBudgetsError] = useState<string | null>(null)
+  const [budgetId, setBudgetId] = useState<number | "">("")
+
+  const [rows, setRows] = useState<BudgetVsActualRow[] | null>(null)
+  const [error, setError] = useState<string | null>(null)
+
+  useEffect(() => {
+    glBudgetsApi
+      .list()
+      .then((res) => setBudgets(res))
+      .catch((err) => setBudgetsError(errorMessage(err)))
+  }, [])
+
+  // Clears stale results the instant budgetId changes, during the render that reacts to it —
+  // not inside the effect below, which would be a synchronous setState-in-effect
+  // (react-hooks/set-state-in-effect); this is React's own sanctioned "adjust state during
+  // render" pattern instead.
+  const [loadedFor, setLoadedFor] = useState<number | "">("")
+  if (loadedFor !== budgetId) {
+    setLoadedFor(budgetId)
+    setRows(null)
+    setError(null)
+  }
+
+  useEffect(() => {
+    if (!budgetId) return
+    let cancelled = false
+    reportsApi
+      .budgetVsActual(budgetId)
+      .then((res) => {
+        if (!cancelled) setRows(res)
+      })
+      .catch((err) => {
+        if (!cancelled) setError(errorMessage(err))
+      })
+    return () => {
+      cancelled = true
+    }
+  }, [budgetId])
+
+  const selectedBudget = useMemo(() => (budgets ?? []).find((b) => b.budgetId === budgetId) ?? null, [budgets, budgetId])
+
+  const totalBudgeted = (rows ?? []).reduce((sum, r) => sum + r.budgetedAmount, 0)
+  const totalActual = (rows ?? []).reduce((sum, r) => sum + r.actualAmount, 0)
+  const totalVariance = (rows ?? []).reduce((sum, r) => sum + r.variance, 0)
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex items-center gap-3">
+        <Link href="/dashboard/ledgers" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
+          <ArrowLeft className="size-5" />
+        </Link>
+        <div>
+          <h1 className="text-2xl font-bold text-foreground">Budget vs Actual</h1>
+          <p className="text-base text-muted-foreground">Budgeted amounts against real postings per account/period.</p>
+        </div>
+      </div>
+
+      {budgetsError && (
+        <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{budgetsError}</div>
+      )}
+
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-end sm:justify-between">
+        <div className="flex flex-col gap-1.5 sm:w-96">
+          <Label className="text-base">Budget</Label>
+          <Select<number | ""> value={budgetId} onValueChange={(v) => setBudgetId(v ?? "")}>
+            <SelectTrigger className="h-11! w-full text-base">
+              <SelectValue placeholder={budgets === null ? "Loading…" : "Select a budget"} />
+            </SelectTrigger>
+            <SelectContent>
+              {(budgets ?? []).map((b) => (
+                <SelectItem key={b.budgetId} value={b.budgetId} label={b.name} className="text-base">
+                  {b.name}
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+        </div>
+        <div className="flex gap-2">
+          <DownloadPdfButton reportType={ReportType.BudgetVsActual} params={{ budgetId: budgetId || undefined }} disabled={!rows} />
+          <DownloadCsvButton reportType={ReportType.BudgetVsActual} params={{ budgetId: budgetId || undefined }} disabled={!rows} />
+        </div>
+      </div>
+
+      {error && (
+        <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>
+      )}
+
+      {!error && !budgetId && (
+        <div className="flex flex-col items-center gap-4 rounded-xl border border-dashed py-20 text-center">
+          <BadgeDollarSign className="size-12 text-muted-foreground" />
+          <p className="text-base text-muted-foreground">Select a budget to compare against actuals.</p>
+        </div>
+      )}
+
+      {!error && budgetId && rows === null && (
+        <div className="flex flex-col gap-3">
+          {Array.from({ length: 5 }).map((_, i) => (
+            <Skeleton key={i} className="h-12 w-full" />
+          ))}
+        </div>
+      )}
+
+      {!error && budgetId && rows !== null && rows.length === 0 && (
+        <div className="flex flex-col items-center gap-4 rounded-xl border border-dashed py-20 text-center">
+          <BadgeDollarSign className="size-12 text-muted-foreground" />
+          <p className="text-base text-muted-foreground">This budget has no lines yet.</p>
+        </div>
+      )}
+
+      {!error && budgetId && rows !== null && rows.length > 0 && (
+        <div className="rounded-2xl bg-white p-6 shadow-sm ring-1 ring-black/5">
+          <ReportHeader title="Budget vs Actual" subtitle={selectedBudget?.name ?? ""} />
+          <Table className="mt-4 text-base">
+            <TableHeader>
+              <TableRow>
+                <TableHead className="h-11 px-3 text-sm">Account</TableHead>
+                <TableHead className="h-11 px-3 text-right text-sm">Budgeted</TableHead>
+                <TableHead className="h-11 px-3 text-right text-sm">Actual</TableHead>
+                <TableHead className="h-11 px-3 text-right text-sm">Variance</TableHead>
+              </TableRow>
+            </TableHeader>
+            <TableBody>
+              {rows.map((row) => (
+                <TableRow key={row.budgetLineId}>
+                  <TableCell className="px-3 py-2.5">
+                    <span className="text-muted-foreground">{row.accountCode}</span>{" "}
+                    <span>{row.accountName}</span>
+                  </TableCell>
+                  <TableCell className="px-3 py-2.5 text-right tabular-nums">{formatAmount(row.budgetedAmount)}</TableCell>
+                  <TableCell className="px-3 py-2.5 text-right tabular-nums">{formatAmount(row.actualAmount)}</TableCell>
+                  <TableCell
+                    className={cn(
+                      "px-3 py-2.5 text-right font-medium tabular-nums",
+                      row.variance < 0 ? "text-destructive" : "text-success"
+                    )}
+                  >
+                    {formatAmount(row.variance)}
+                  </TableCell>
+                </TableRow>
+              ))}
+            </TableBody>
+            <TableFooter className="border-t-2 border-foreground/70 bg-transparent">
+              <TableRow className="hover:bg-transparent">
+                <TableCell className="px-3 py-3 font-bold">Total</TableCell>
+                <TableCell className="px-3 py-3 text-right font-bold tabular-nums">{formatAmount(totalBudgeted)}</TableCell>
+                <TableCell className="px-3 py-3 text-right font-bold tabular-nums">{formatAmount(totalActual)}</TableCell>
+                <TableCell className="px-3 py-3 text-right font-bold tabular-nums">{formatAmount(totalVariance)}</TableCell>
+              </TableRow>
+            </TableFooter>
+          </Table>
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/ledgers/cash-flow/page.tsx b/Frontend/erp-system/app/dashboard/ledgers/cash-flow/page.tsx
new file mode 100644
index 0000000..9468a69
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/ledgers/cash-flow/page.tsx
@@ -0,0 +1,184 @@
+"use client"
+
+import { useEffect, useState } from "react"
+import Link from "next/link"
+import { ArrowLeft, Wallet } from "lucide-react"
+
+import { reportsApi } from "@/lib/api/general-ledger"
+import { errorMessage } from "@/lib/error-map"
+import { formatReportDate, startOfMonthIso, todayIso } from "@/lib/format"
+import { cn } from "@/lib/utils"
+import {
+  CashFlowFinancingActivities,
+  CashFlowInvestingActivities,
+  CashFlowResponse,
+  ReportType,
+} from "@/types/general-ledger"
+
+import { buttonVariants } from "@/components/ui/button"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { Skeleton } from "@/components/ui/skeleton"
+import { DownloadCsvButton } from "@/components/reports/DownloadCsvButton"
+import { DownloadPdfButton } from "@/components/reports/DownloadPdfButton"
+import { ReportHeader } from "@/components/reports/ReportHeader"
+import { ReportSection, ReportSectionLine } from "@/components/reports/ReportSection"
+import { ReportSubtotal } from "@/components/reports/ReportSubtotal"
+
+/**
+ * Combines `operatingActivities.nonCashAdjustments` + `.workingCapitalChanges` into one labeled
+ * set, then buckets by sign — per docs/21-GENERAL-LEDGER-FRONTEND.md §3: "Additions to Cash"
+ * (amount >= 0) and "Subtractions From Cash" (amount < 0). A working-capital line's label uses its
+ * `direction` field ("Decrease in Trade Receivables"); a non-cash-adjustment line just prints its
+ * plain `description` ("Depreciation"), no Increase/Decrease prefix.
+ */
+function bucketOperatingLines(report: CashFlowResponse): { additions: ReportSectionLine[]; subtractions: ReportSectionLine[] } {
+  // GL omits these list fields entirely (rather than sending `[]`) when there's nothing to
+  // report for the period, instead of an empty array — confirmed live, not just a type-safety guard.
+  const operating = report.operatingActivities
+  const combined: ReportSectionLine[] = [
+    ...(operating?.nonCashAdjustments ?? []).map((a) => ({ label: a.description, amount: a.amount })),
+    ...(operating?.workingCapitalChanges ?? []).map((w) => ({
+      label: `${w.direction} in ${w.accountName}`,
+      amount: w.changeAmount,
+    })),
+  ]
+  return {
+    additions: combined.filter((l) => l.amount >= 0),
+    subtractions: combined.filter((l) => l.amount < 0),
+  }
+}
+
+/** Same "GL omits empty list fields" defense as bucketOperatingLines — the section itself,
+ * or just its `lines[]`, may be missing entirely rather than `{ lines: [], ...: 0 }`. */
+function activitySectionLines(
+  section?: CashFlowInvestingActivities | CashFlowFinancingActivities | null
+): ReportSectionLine[] {
+  return (section?.lines ?? []).map((l) => ({ label: l.description, amount: l.amount }))
+}
+
+export default function CashFlowPage() {
+  const [periodStart, setPeriodStart] = useState(startOfMonthIso())
+  const [periodEnd, setPeriodEnd] = useState(todayIso())
+  const [report, setReport] = useState<CashFlowResponse | null>(null)
+  const [error, setError] = useState<string | null>(null)
+
+  // Clears stale results the instant the period changes, during the render that reacts to it —
+  // not inside the effect below, which would be a synchronous setState-in-effect
+  // (react-hooks/set-state-in-effect); this is React's own sanctioned "adjust state during
+  // render" pattern instead.
+  const periodKey = `${periodStart}|${periodEnd}`
+  const [loadedFor, setLoadedFor] = useState<string | null>(null)
+  if (loadedFor !== periodKey) {
+    setLoadedFor(periodKey)
+    setReport(null)
+    setError(null)
+  }
+
+  useEffect(() => {
+    if (!periodStart || !periodEnd) return
+    let cancelled = false
+    reportsApi
+      .cashFlow(periodStart, periodEnd)
+      .then((res) => {
+        if (!cancelled) setReport(res)
+      })
+      .catch((err) => {
+        if (!cancelled) setError(errorMessage(err))
+      })
+    return () => {
+      cancelled = true
+    }
+  }, [periodStart, periodEnd])
+
+  const buckets = report ? bucketOperatingLines(report) : null
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex items-center gap-3">
+        <Link href="/dashboard/ledgers" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
+          <ArrowLeft className="size-5" />
+        </Link>
+        <div>
+          <h1 className="text-2xl font-bold text-foreground">Cash Flow</h1>
+          <p className="text-base text-muted-foreground">Statement of Cash Flows for a period.</p>
+        </div>
+      </div>
+
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-end sm:justify-between">
+        <div className="grid grid-cols-2 gap-3 sm:flex sm:items-end">
+          <div className="flex flex-col gap-1.5">
+            <Label className="text-base">From</Label>
+            <Input type="date" value={periodStart} onChange={(e) => setPeriodStart(e.target.value)} className="h-11 text-base" />
+          </div>
+          <div className="flex flex-col gap-1.5">
+            <Label className="text-base">To</Label>
+            <Input type="date" value={periodEnd} onChange={(e) => setPeriodEnd(e.target.value)} className="h-11 text-base" />
+          </div>
+        </div>
+        <div className="flex gap-2">
+          <DownloadPdfButton reportType={ReportType.CashFlow} params={{ periodStart, periodEnd }} disabled={!report} />
+          <DownloadCsvButton reportType={ReportType.CashFlow} params={{ periodStart, periodEnd }} disabled={!report} />
+        </div>
+      </div>
+
+      {error && (
+        <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>
+      )}
+
+      {!error && report === null && (
+        <div className="flex flex-col gap-3">
+          {Array.from({ length: 6 }).map((_, i) => (
+            <Skeleton key={i} className="h-12 w-full" />
+          ))}
+        </div>
+      )}
+
+      {!error && report !== null && buckets !== null && (
+        <div className="rounded-2xl bg-white p-6 shadow-sm ring-1 ring-black/5">
+          <ReportHeader
+            title="Statement of Cash Flows"
+            subtitle={`For the period ${formatReportDate(periodStart)} to ${formatReportDate(periodEnd)}`}
+          />
+
+          <div className="mt-4">
+            <ReportSubtotal label="Net Earnings" amount={report.operatingActivities?.profitForPeriod ?? 0} />
+            <ReportSection title="Additions to Cash" lines={buckets.additions} />
+            <ReportSection title="Subtractions From Cash" lines={buckets.subtractions} />
+            <ReportSubtotal
+              label="Net Cash From Operations"
+              amount={report.operatingActivities?.netCashFromOperatingActivities ?? 0}
+            />
+
+            <ReportSection
+              title="Investing Activities"
+              lines={activitySectionLines(report.investingActivities)}
+              total={
+                (report.investingActivities?.lines?.length ?? 0) > 1
+                  ? report.investingActivities?.netCashFromInvestingActivities
+                  : undefined
+              }
+            />
+            <ReportSection
+              title="Financing Activities"
+              lines={activitySectionLines(report.financingActivities)}
+              total={
+                (report.financingActivities?.lines?.length ?? 0) > 1
+                  ? report.financingActivities?.netCashFromFinancingActivities
+                  : undefined
+              }
+            />
+
+            <ReportSubtotal label="Net Increase / Decrease in Cash" amount={report.netIncreaseDecreaseInCash} large />
+          </div>
+
+          <p className="mt-2 flex items-center gap-1.5 text-sm text-muted-foreground">
+            <Wallet className="size-4" />
+            Opening/closing cash balances are computed by the General Ledger service but not shown on this
+            screen, matching GL&apos;s own PDF/CSV output.
+          </p>
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/ledgers/general-ledger/page.tsx b/Frontend/erp-system/app/dashboard/ledgers/general-ledger/page.tsx
new file mode 100644
index 0000000..5b6f70b
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/ledgers/general-ledger/page.tsx
@@ -0,0 +1,148 @@
+"use client"
+
+import { Fragment, useEffect, useState } from "react"
+import Link from "next/link"
+import { ArrowLeft, BookOpen } from "lucide-react"
+
+import { reportsApi } from "@/lib/api/general-ledger"
+import { errorMessage } from "@/lib/error-map"
+import { formatAmount, formatReportDate, startOfMonthIso, todayIso } from "@/lib/format"
+import { cn } from "@/lib/utils"
+import { GeneralLedgerRow, ReportType } from "@/types/general-ledger"
+
+import { buttonVariants } from "@/components/ui/button"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { Skeleton } from "@/components/ui/skeleton"
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+import { DownloadCsvButton } from "@/components/reports/DownloadCsvButton"
+import { DownloadPdfButton } from "@/components/reports/DownloadPdfButton"
+import { ReportHeader } from "@/components/reports/ReportHeader"
+
+export default function GeneralLedgerReportPage() {
+  const [periodStart, setPeriodStart] = useState(startOfMonthIso())
+  const [periodEnd, setPeriodEnd] = useState(todayIso())
+
+  const [rows, setRows] = useState<GeneralLedgerRow[] | null>(null)
+  const [error, setError] = useState<string | null>(null)
+
+  // Clears stale results the instant the period changes, during the render that reacts to it —
+  // not inside the effect below, which would be a synchronous setState-in-effect
+  // (react-hooks/set-state-in-effect); this is React's own sanctioned "adjust state during
+  // render" pattern instead.
+  const periodKey = `${periodStart}|${periodEnd}`
+  const [loadedFor, setLoadedFor] = useState<string | null>(null)
+  if (loadedFor !== periodKey) {
+    setLoadedFor(periodKey)
+    setRows(null)
+    setError(null)
+  }
+
+  useEffect(() => {
+    if (!periodStart || !periodEnd) return
+    let cancelled = false
+    reportsApi
+      .generalLedger(periodStart, periodEnd)
+      .then((res) => {
+        if (!cancelled) setRows(res)
+      })
+      .catch((err) => {
+        if (!cancelled) setError(errorMessage(err))
+      })
+    return () => {
+      cancelled = true
+    }
+  }, [periodStart, periodEnd])
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex items-center gap-3">
+        <Link href="/dashboard/ledgers" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
+          <ArrowLeft className="size-5" />
+        </Link>
+        <div>
+          <h1 className="text-2xl font-bold text-foreground">General Ledger</h1>
+          <p className="text-base text-muted-foreground">Every posted movement on every account, with a running balance per account.</p>
+        </div>
+      </div>
+
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-end sm:justify-between">
+        <div className="grid grid-cols-2 gap-3 sm:flex sm:items-end">
+          <div className="flex flex-col gap-1.5">
+            <Label className="text-base">From</Label>
+            <Input type="date" value={periodStart} onChange={(e) => setPeriodStart(e.target.value)} className="h-11 text-base" />
+          </div>
+          <div className="flex flex-col gap-1.5">
+            <Label className="text-base">To</Label>
+            <Input type="date" value={periodEnd} onChange={(e) => setPeriodEnd(e.target.value)} className="h-11 text-base" />
+          </div>
+        </div>
+        <div className="flex gap-2">
+          <DownloadPdfButton reportType={ReportType.GeneralLedger} params={{ periodStart, periodEnd }} disabled={!rows} />
+          <DownloadCsvButton reportType={ReportType.GeneralLedger} params={{ periodStart, periodEnd }} disabled={!rows} />
+        </div>
+      </div>
+
+      {error && (
+        <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>
+      )}
+
+      {!error && rows === null && (
+        <div className="flex flex-col gap-3">
+          {Array.from({ length: 6 }).map((_, i) => (
+            <Skeleton key={i} className="h-12 w-full" />
+          ))}
+        </div>
+      )}
+
+      {!error && rows !== null && rows.length === 0 && (
+        <div className="flex flex-col items-center gap-4 rounded-xl border border-dashed py-20 text-center">
+          <BookOpen className="size-12 text-muted-foreground" />
+          <p className="text-base text-muted-foreground">No postings on any account in the selected period.</p>
+        </div>
+      )}
+
+      {!error && rows !== null && rows.length > 0 && (
+        <div className="rounded-2xl bg-white p-6 shadow-sm ring-1 ring-black/5">
+          <ReportHeader title="General Ledger" subtitle={`${formatReportDate(periodStart)} to ${formatReportDate(periodEnd)}`} />
+          <Table className="mt-4 text-base">
+            <TableHeader>
+              <TableRow>
+                <TableHead className="h-11 px-3 text-sm">Date</TableHead>
+                <TableHead className="h-11 px-3 text-sm">Journal No.</TableHead>
+                <TableHead className="h-11 px-3 text-sm">Narration</TableHead>
+                <TableHead className="h-11 px-3 text-right text-sm">Debit</TableHead>
+                <TableHead className="h-11 px-3 text-right text-sm">Credit</TableHead>
+                <TableHead className="h-11 px-3 text-right text-sm">Running balance</TableHead>
+              </TableRow>
+            </TableHeader>
+            <TableBody>
+              {rows.map((row, i) => {
+                const isNewAccount = i === 0 || row.accountCode !== rows[i - 1].accountCode
+                return (
+                  <Fragment key={i}>
+                    {isNewAccount && (
+                      <TableRow className="bg-muted/40 hover:bg-muted/40">
+                        <TableCell colSpan={6} className="px-3 py-2 font-semibold">
+                          {row.accountCode} — {row.accountName}
+                        </TableCell>
+                      </TableRow>
+                    )}
+                    <TableRow>
+                      <TableCell className="px-3 py-2.5">{formatReportDate(row.entryDate)}</TableCell>
+                      <TableCell className="px-3 py-2.5 font-medium">{row.journalNo}</TableCell>
+                      <TableCell className="px-3 py-2.5 text-muted-foreground">{row.narration ?? "—"}</TableCell>
+                      <TableCell className="px-3 py-2.5 text-right tabular-nums">{formatAmount(row.debitAmount, true)}</TableCell>
+                      <TableCell className="px-3 py-2.5 text-right tabular-nums">{formatAmount(row.creditAmount, true)}</TableCell>
+                      <TableCell className="px-3 py-2.5 text-right font-medium tabular-nums">{formatAmount(row.runningBalance)}</TableCell>
+                    </TableRow>
+                  </Fragment>
+                )
+              })}
+            </TableBody>
+          </Table>
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/ledgers/page.tsx b/Frontend/erp-system/app/dashboard/ledgers/page.tsx
new file mode 100644
index 0000000..e9d3482
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/ledgers/page.tsx
@@ -0,0 +1,91 @@
+import Link from "next/link"
+import {
+  BadgeDollarSign,
+  BookOpen,
+  Landmark,
+  LineChart,
+  PieChart,
+  Receipt,
+  Scale,
+  type LucideIcon,
+} from "lucide-react"
+
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
+
+const areas: { title: string; description: string; href: string; icon: LucideIcon }[] = [
+  {
+    title: "Trial Balance",
+    description: "Every postable account's debit/credit balance as at a given date.",
+    href: "/dashboard/ledgers/trial-balance",
+    icon: Scale,
+  },
+  {
+    title: "Balance Sheet",
+    description: "Statement of Financial Position — Assets, Liabilities and Equity as at a date.",
+    href: "/dashboard/ledgers/balance-sheet",
+    icon: Landmark,
+  },
+  {
+    title: "General Ledger",
+    description: "Every posted movement on one account across a date range, with running balance.",
+    href: "/dashboard/ledgers/general-ledger",
+    icon: BookOpen,
+  },
+  {
+    title: "Profit & Loss",
+    description: "Statement of Profit or Loss — Income and Expense for a period.",
+    href: "/dashboard/ledgers/profit-and-loss",
+    icon: LineChart,
+  },
+  {
+    title: "Cash Flow",
+    description: "Statement of Cash Flows — operating, investing and financing movement for a period.",
+    href: "/dashboard/ledgers/cash-flow",
+    icon: PieChart,
+  },
+  {
+    title: "Budget vs Actual",
+    description: "Budgeted amounts against real postings per account/period, with variance.",
+    href: "/dashboard/ledgers/budget-vs-actual",
+    icon: BadgeDollarSign,
+  },
+  {
+    title: "Tax Report",
+    description: "Income Tax Computation for a period, with optional adjustments.",
+    href: "/dashboard/ledgers/tax-report",
+    icon: Receipt,
+  },
+]
+
+export default function LedgersHubPage() {
+  return (
+    <div className="flex flex-col gap-6">
+      <div>
+        <h1 className="text-2xl font-bold text-foreground">Ledgers</h1>
+        <p className="text-base text-muted-foreground">
+          Statutory-format financial reports from the General Ledger service.
+        </p>
+      </div>
+
+      <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 xl:grid-cols-3">
+        {areas.map((area) => (
+          <Link key={area.href} href={area.href}>
+            <Card className="h-full transition-shadow hover:shadow-md">
+              <CardHeader>
+                <div className="flex items-center gap-3">
+                  <div className="flex size-11 shrink-0 items-center justify-center rounded-xl bg-primary/10 text-primary">
+                    <area.icon className="size-5" />
+                  </div>
+                  <CardTitle className="text-lg">{area.title}</CardTitle>
+                </div>
+              </CardHeader>
+              <CardContent>
+                <p className="text-base text-muted-foreground">{area.description}</p>
+              </CardContent>
+            </Card>
+          </Link>
+        ))}
+      </div>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/ledgers/profit-and-loss/page.tsx b/Frontend/erp-system/app/dashboard/ledgers/profit-and-loss/page.tsx
new file mode 100644
index 0000000..f6be336
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/ledgers/profit-and-loss/page.tsx
@@ -0,0 +1,166 @@
+"use client"
+
+import { useEffect, useState } from "react"
+import Link from "next/link"
+import { ArrowLeft, LineChart } from "lucide-react"
+
+import { reportsApi } from "@/lib/api/general-ledger"
+import { errorMessage } from "@/lib/error-map"
+import { formatReportDate, startOfMonthIso, todayIso } from "@/lib/format"
+import { cn } from "@/lib/utils"
+import { ProfitAndLossResponse, ProfitAndLossSection, ReportType } from "@/types/general-ledger"
+
+import { buttonVariants } from "@/components/ui/button"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { Skeleton } from "@/components/ui/skeleton"
+import { DownloadCsvButton } from "@/components/reports/DownloadCsvButton"
+import { DownloadPdfButton } from "@/components/reports/DownloadPdfButton"
+import { ReportHeader } from "@/components/reports/ReportHeader"
+import { ReportSection } from "@/components/reports/ReportSection"
+import { ReportSubtotal } from "@/components/reports/ReportSubtotal"
+
+function pnlSectionLines(section: ProfitAndLossSection | undefined) {
+  return (section?.lines ?? []).map((line) => ({
+    label: (
+      <>
+        <span className="text-muted-foreground">{line.accountCode}</span> <span>{line.accountName}</span>
+      </>
+    ),
+    amount: line.amount,
+  }))
+}
+
+export default function ProfitAndLossPage() {
+  const [periodStart, setPeriodStart] = useState(startOfMonthIso())
+  const [periodEnd, setPeriodEnd] = useState(todayIso())
+  const [report, setReport] = useState<ProfitAndLossResponse | null>(null)
+  const [error, setError] = useState<string | null>(null)
+
+  // Clears stale results the instant the period changes, during the render that reacts to it —
+  // not inside the effect below, which would be a synchronous setState-in-effect
+  // (react-hooks/set-state-in-effect); this is React's own sanctioned "adjust state during
+  // render" pattern instead.
+  const periodKey = `${periodStart}|${periodEnd}`
+  const [loadedFor, setLoadedFor] = useState<string | null>(null)
+  if (loadedFor !== periodKey) {
+    setLoadedFor(periodKey)
+    setReport(null)
+    setError(null)
+  }
+
+  useEffect(() => {
+    if (!periodStart || !periodEnd) return
+    let cancelled = false
+    reportsApi
+      .profitAndLoss(periodStart, periodEnd)
+      .then((res) => {
+        if (!cancelled) setReport(res)
+      })
+      .catch((err) => {
+        if (!cancelled) setError(errorMessage(err))
+      })
+    return () => {
+      cancelled = true
+    }
+  }, [periodStart, periodEnd])
+
+  // GL omits an empty/zero section entirely rather than sending `{ lines: [], total: 0 }` —
+  // confirmed on Cash Flow's equivalent fields, same inferred nested-section shape here.
+  const isEmpty =
+    report !== null &&
+    (report.sales?.lines?.length ?? 0) === 0 &&
+    (report.costOfSales?.lines?.length ?? 0) === 0 &&
+    (report.otherIncome?.lines?.length ?? 0) === 0 &&
+    (report.distributionExpenses?.lines?.length ?? 0) === 0 &&
+    (report.administrationExpenses?.lines?.length ?? 0) === 0 &&
+    (report.otherExpenses?.lines?.length ?? 0) === 0 &&
+    (report.financialExpenses?.lines?.length ?? 0) === 0 &&
+    (report.unclassified?.lines?.length ?? 0) === 0
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex items-center gap-3">
+        <Link href="/dashboard/ledgers" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
+          <ArrowLeft className="size-5" />
+        </Link>
+        <div>
+          <h1 className="text-2xl font-bold text-foreground">Profit &amp; Loss</h1>
+          <p className="text-base text-muted-foreground">Statement of Profit or Loss — Income and Expense for a period.</p>
+        </div>
+      </div>
+
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-end sm:justify-between">
+        <div className="grid grid-cols-2 gap-3 sm:flex sm:items-end">
+          <div className="flex flex-col gap-1.5">
+            <Label className="text-base">From</Label>
+            <Input type="date" value={periodStart} onChange={(e) => setPeriodStart(e.target.value)} className="h-11 text-base" />
+          </div>
+          <div className="flex flex-col gap-1.5">
+            <Label className="text-base">To</Label>
+            <Input type="date" value={periodEnd} onChange={(e) => setPeriodEnd(e.target.value)} className="h-11 text-base" />
+          </div>
+        </div>
+        <div className="flex gap-2">
+          <DownloadPdfButton reportType={ReportType.ProfitAndLoss} params={{ periodStart, periodEnd }} disabled={!report} />
+          <DownloadCsvButton reportType={ReportType.ProfitAndLoss} params={{ periodStart, periodEnd }} disabled={!report} />
+        </div>
+      </div>
+
+      {error && (
+        <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>
+      )}
+
+      {!error && report === null && (
+        <div className="flex flex-col gap-3">
+          {Array.from({ length: 6 }).map((_, i) => (
+            <Skeleton key={i} className="h-12 w-full" />
+          ))}
+        </div>
+      )}
+
+      {!error && isEmpty && (
+        <div className="flex flex-col items-center gap-4 rounded-xl border border-dashed py-20 text-center">
+          <LineChart className="size-12 text-muted-foreground" />
+          <p className="text-base text-muted-foreground">No Income/Expense accounts posted in this period.</p>
+        </div>
+      )}
+
+      {!error && report !== null && !isEmpty && (
+        <div className="rounded-2xl bg-white p-6 shadow-sm ring-1 ring-black/5">
+          <ReportHeader
+            title="Statement of Profit or Loss"
+            subtitle={`For the period ${formatReportDate(periodStart)} to ${formatReportDate(periodEnd)}`}
+          />
+
+          <div className="mt-4">
+            <ReportSection title="Sales" lines={pnlSectionLines(report.sales)} total={report.sales?.total} />
+            <ReportSection title="Cost of Sales" lines={pnlSectionLines(report.costOfSales)} total={report.costOfSales?.total} />
+            <ReportSubtotal label="Gross Profit" amount={report.grossProfit} />
+            <ReportSection title="Other Income" lines={pnlSectionLines(report.otherIncome)} total={report.otherIncome?.total} />
+            <ReportSection
+              title="Distribution Expenses"
+              lines={pnlSectionLines(report.distributionExpenses)}
+              total={report.distributionExpenses?.total}
+            />
+            <ReportSection
+              title="Administration Expenses"
+              lines={pnlSectionLines(report.administrationExpenses)}
+              total={report.administrationExpenses?.total}
+            />
+            <ReportSection title="Other Expenses" lines={pnlSectionLines(report.otherExpenses)} total={report.otherExpenses?.total} />
+            <ReportSection
+              title="Financial Expenses"
+              lines={pnlSectionLines(report.financialExpenses)}
+              total={report.financialExpenses?.total}
+            />
+            {report.unclassified && (
+              <ReportSection title="Unclassified" lines={pnlSectionLines(report.unclassified)} total={report.unclassified?.total} />
+            )}
+            <ReportSubtotal label="Net Profit for the Period" amount={report.netProfitForPeriod} large />
+          </div>
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/ledgers/tax-report/page.tsx b/Frontend/erp-system/app/dashboard/ledgers/tax-report/page.tsx
new file mode 100644
index 0000000..84fc52d
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/ledgers/tax-report/page.tsx
@@ -0,0 +1,284 @@
+"use client"
+
+import { useEffect, useState } from "react"
+import Link from "next/link"
+import { ArrowLeft, ChevronDown, ChevronRight, Receipt } from "lucide-react"
+
+import { reportsApi } from "@/lib/api/general-ledger"
+import { errorMessage } from "@/lib/error-map"
+import { formatAmount, formatReportDate, startOfMonthIso, todayIso } from "@/lib/format"
+import { cn } from "@/lib/utils"
+import { ReportType, TaxSummaryResponse } from "@/types/general-ledger"
+
+import { Button, buttonVariants } from "@/components/ui/button"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { Skeleton } from "@/components/ui/skeleton"
+import { Table, TableBody, TableCell, TableRow } from "@/components/ui/table"
+import { DownloadCsvButton } from "@/components/reports/DownloadCsvButton"
+import { DownloadPdfButton } from "@/components/reports/DownloadPdfButton"
+
+// Fixed row order + Add:/Less: labels per the confirmed GL contract
+// (04_API_Reference_And_Scenarios.md, Module: Reporting — `profitBeforeTax` through
+// `balanceTaxPayable`) — GL sends plain numbers, not pre-formatted rows; the prefix/bold treatment
+// lives here, not derived from sign. `taxRatePercent` is shown separately below the table (it's a
+// percentage, not a currency amount) rather than run through `formatAmount` here.
+const ROWS: { key: keyof TaxSummaryResponse; label: string; bold?: boolean }[] = [
+  { key: "profitBeforeTax", label: "Profit Before Tax" },
+  { key: "nonDeductibleExpenses", label: "Add: Non-Deductible Expenses" },
+  { key: "allowableDeductions", label: "Less: Allowable Deductions" },
+  { key: "adjustedBusinessProfit", label: "Adjusted Business Profit", bold: true },
+  { key: "otherTaxableIncome", label: "Add: Other Taxable Income" },
+  { key: "assessableIncome", label: "Assessable Income", bold: true },
+  { key: "qualifyingPaymentsReliefs", label: "Less: Qualifying Payments / Reliefs" },
+  { key: "taxableIncome", label: "Taxable Income", bold: true },
+  { key: "corporateIncomeTax", label: "Corporate Income Tax" },
+  { key: "surchargeAmount", label: "Add: Surcharge / Education Levy" },
+  { key: "grossTaxLiability", label: "Gross Tax Liability", bold: true },
+  { key: "apitCredit", label: "Less: APIT Credit" },
+  { key: "whtCredit", label: "Less: WHT Credit" },
+  { key: "quarterlyTaxPayments", label: "Less: Quarterly Tax Payments" },
+]
+
+export default function TaxReportPage() {
+  const [periodStart, setPeriodStart] = useState(startOfMonthIso())
+  const [periodEnd, setPeriodEnd] = useState(todayIso())
+
+  const [adjustmentsOpen, setAdjustmentsOpen] = useState(false)
+  const [allowableDeductions, setAllowableDeductions] = useState("")
+  const [otherTaxableIncome, setOtherTaxableIncome] = useState("")
+  const [qualifyingPaymentsReliefs, setQualifyingPaymentsReliefs] = useState("")
+  const [surchargeAmount, setSurchargeAmount] = useState("")
+  const [taxRateOverride, setTaxRateOverride] = useState("")
+
+  const [report, setReport] = useState<TaxSummaryResponse | null>(null)
+  const [error, setError] = useState<string | null>(null)
+
+  // Optional inputs get no client-side default — an untouched field sends nothing (undefined,
+  // dropped by lib/api/general-ledger.ts's query builder), letting GL's own server-side
+  // defaulting be the single source of truth for what "not supplied" means.
+  const params = {
+    periodStart,
+    periodEnd,
+    allowableDeductions: allowableDeductions === "" ? undefined : Number(allowableDeductions),
+    otherTaxableIncome: otherTaxableIncome === "" ? undefined : Number(otherTaxableIncome),
+    qualifyingPaymentsReliefs: qualifyingPaymentsReliefs === "" ? undefined : Number(qualifyingPaymentsReliefs),
+    surchargeAmount: surchargeAmount === "" ? undefined : Number(surchargeAmount),
+    taxRateOverride: taxRateOverride === "" ? undefined : Number(taxRateOverride),
+  }
+  const paramsKey = JSON.stringify(params)
+
+  // Clears stale results the instant a param changes, during the render that reacts to it — not
+  // inside the effect below, which would be a synchronous setState-in-effect
+  // (react-hooks/set-state-in-effect); this is React's own sanctioned "adjust state during
+  // render" pattern instead.
+  const [loadedFor, setLoadedFor] = useState<string | null>(null)
+  if (loadedFor !== paramsKey) {
+    setLoadedFor(paramsKey)
+    setReport(null)
+    setError(null)
+  }
+
+  useEffect(() => {
+    if (!periodStart || !periodEnd) return
+    let cancelled = false
+    reportsApi
+      .taxSummary(params)
+      .then((res) => {
+        if (!cancelled) setReport(res)
+      })
+      .catch((err) => {
+        if (!cancelled) setError(errorMessage(err))
+      })
+    return () => {
+      cancelled = true
+    }
+    // paramsKey covers every field inside params; re-running on params itself would compare by
+    // reference and fire every render, since it's a fresh object literal each time.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [paramsKey, periodStart, periodEnd])
+
+  const isRefund = report !== null && report.balanceTaxPayable < 0
+  const finalLabel = isRefund ? "BALANCE TAX REFUNDABLE" : "BALANCE TAX PAYABLE"
+  const finalAmount = report ? Math.abs(report.balanceTaxPayable) : 0
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex items-center gap-3">
+        <Link href="/dashboard/ledgers" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
+          <ArrowLeft className="size-5" />
+        </Link>
+        <div>
+          <h1 className="text-2xl font-bold text-foreground">Tax Report</h1>
+          <p className="text-base text-muted-foreground">Income Tax Computation for a period.</p>
+        </div>
+      </div>
+
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-end sm:justify-between">
+        <div className="grid grid-cols-2 gap-3 sm:flex sm:items-end">
+          <div className="flex flex-col gap-1.5">
+            <Label className="text-base">From</Label>
+            <Input type="date" value={periodStart} onChange={(e) => setPeriodStart(e.target.value)} className="h-11 text-base" />
+          </div>
+          <div className="flex flex-col gap-1.5">
+            <Label className="text-base">To</Label>
+            <Input type="date" value={periodEnd} onChange={(e) => setPeriodEnd(e.target.value)} className="h-11 text-base" />
+          </div>
+        </div>
+        <div className="flex gap-2">
+          <DownloadPdfButton reportType={ReportType.TaxSummary} params={params} disabled={!report} />
+          <DownloadCsvButton reportType={ReportType.TaxSummary} params={params} disabled={!report} />
+        </div>
+      </div>
+
+      <div className="rounded-xl border">
+        <button
+          type="button"
+          onClick={() => setAdjustmentsOpen((v) => !v)}
+          className="flex w-full items-center gap-2 px-4 py-3 text-left text-base font-semibold"
+        >
+          {adjustmentsOpen ? <ChevronDown className="size-4" /> : <ChevronRight className="size-4" />}
+          Adjustments (optional)
+        </button>
+        {adjustmentsOpen && (
+          <div className="grid grid-cols-1 gap-3 border-t p-4 sm:grid-cols-2 lg:grid-cols-3">
+            <div className="flex flex-col gap-1.5">
+              <Label className="text-sm">Allowable Deductions</Label>
+              <Input
+                type="number"
+                value={allowableDeductions}
+                onChange={(e) => setAllowableDeductions(e.target.value)}
+                placeholder="0"
+                className="h-10 text-base"
+              />
+            </div>
+            <div className="flex flex-col gap-1.5">
+              <Label className="text-sm">Other Taxable Income</Label>
+              <Input
+                type="number"
+                value={otherTaxableIncome}
+                onChange={(e) => setOtherTaxableIncome(e.target.value)}
+                placeholder="0"
+                className="h-10 text-base"
+              />
+            </div>
+            <div className="flex flex-col gap-1.5">
+              <Label className="text-sm">Qualifying Payments / Reliefs</Label>
+              <Input
+                type="number"
+                value={qualifyingPaymentsReliefs}
+                onChange={(e) => setQualifyingPaymentsReliefs(e.target.value)}
+                placeholder="System default"
+                className="h-10 text-base"
+              />
+            </div>
+            <div className="flex flex-col gap-1.5">
+              <Label className="text-sm">Surcharge / Education Levy</Label>
+              <Input
+                type="number"
+                value={surchargeAmount}
+                onChange={(e) => setSurchargeAmount(e.target.value)}
+                placeholder="0"
+                className="h-10 text-base"
+              />
+            </div>
+            <div className="flex flex-col gap-1.5">
+              <Label className="text-sm">Tax Rate Override (%)</Label>
+              <Input
+                type="number"
+                value={taxRateOverride}
+                onChange={(e) => setTaxRateOverride(e.target.value)}
+                placeholder="System default"
+                className="h-10 text-base"
+              />
+            </div>
+            {(allowableDeductions ||
+              otherTaxableIncome ||
+              qualifyingPaymentsReliefs ||
+              surchargeAmount ||
+              taxRateOverride) && (
+              <div className="flex items-end">
+                <Button
+                  variant="outline"
+                  size="sm"
+                  onClick={() => {
+                    setAllowableDeductions("")
+                    setOtherTaxableIncome("")
+                    setQualifyingPaymentsReliefs("")
+                    setSurchargeAmount("")
+                    setTaxRateOverride("")
+                  }}
+                >
+                  Clear adjustments
+                </Button>
+              </div>
+            )}
+          </div>
+        )}
+      </div>
+
+      {error && (
+        <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>
+      )}
+
+      {!error && report === null && (
+        <div className="flex flex-col gap-3">
+          {Array.from({ length: 6 }).map((_, i) => (
+            <Skeleton key={i} className="h-12 w-full" />
+          ))}
+        </div>
+      )}
+
+      {!error && report !== null && (
+        <div className="rounded-2xl bg-white p-6 shadow-sm ring-1 ring-black/5">
+          {/* Own header, not the shared ReportHeader — GL's own PDF gives this report a fuller
+              identity block (company name/address/TIN/BRN) that today lives only in GL's own
+              appsettings.json, with no endpoint exposing it. Deliberately not fabricated here —
+              see docs/21-GENERAL-LEDGER-FRONTEND.md §3's open question. */}
+          <div className="flex flex-col items-center gap-1 border-b-2 border-foreground/70 px-4 pb-5 text-center">
+            <p className="text-xs font-semibold tracking-[0.2em] text-muted-foreground uppercase">
+              General Ledger
+            </p>
+            <h2 className="text-xl font-bold tracking-tight text-foreground uppercase">Income Tax Computation</h2>
+            <p className="text-base text-muted-foreground">
+              For the period {formatReportDate(periodStart)} to {formatReportDate(periodEnd)}
+            </p>
+            <p className="text-sm text-muted-foreground">
+              Company identity (name/address/TIN/BRN) isn&apos;t shown here — GL exposes no endpoint for it yet.
+            </p>
+          </div>
+
+          <div className="flex items-center gap-2 py-3 text-muted-foreground">
+            <Receipt className="size-4" />
+            <p className="flex-1 text-sm">
+              All amounts in Sri Lankan Rupees (LKR) unless stated otherwise.
+            </p>
+          </div>
+
+          <Table className="text-base">
+            <TableBody>
+              {ROWS.map((row) => (
+                <TableRow key={row.key} className={row.bold ? "bg-muted/40 hover:bg-muted/40" : undefined}>
+                  <TableCell className={cn("px-3 py-2.5", row.bold && "font-semibold")}>{row.label}</TableCell>
+                  <TableCell className={cn("px-3 py-2.5 text-right tabular-nums", row.bold && "font-semibold")}>
+                    {formatAmount(report[row.key] as number)}
+                  </TableCell>
+                </TableRow>
+              ))}
+              <TableRow className="border-t-2 border-foreground/70 bg-muted/60 hover:bg-muted/60">
+                <TableCell className="px-3 py-3 text-base font-bold">{finalLabel}</TableCell>
+                <TableCell className="px-3 py-3 text-right text-base font-bold tabular-nums">
+                  {formatAmount(finalAmount)}
+                </TableCell>
+              </TableRow>
+            </TableBody>
+          </Table>
+
+          <p className="mt-3 text-sm text-muted-foreground">
+            Tax rate applied: {report.taxRatePercent}%
+          </p>
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/ledgers/trial-balance/page.tsx b/Frontend/erp-system/app/dashboard/ledgers/trial-balance/page.tsx
new file mode 100644
index 0000000..b2640a4
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/ledgers/trial-balance/page.tsx
@@ -0,0 +1,134 @@
+"use client"
+
+import { useEffect, useState } from "react"
+import Link from "next/link"
+import { ArrowLeft, Scale } from "lucide-react"
+
+import { reportsApi } from "@/lib/api/general-ledger"
+import { errorMessage } from "@/lib/error-map"
+import { formatAmount, formatReportDate, todayIso } from "@/lib/format"
+import { cn } from "@/lib/utils"
+import { ReportType, TrialBalanceRow } from "@/types/general-ledger"
+
+import { buttonVariants } from "@/components/ui/button"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { Skeleton } from "@/components/ui/skeleton"
+import { Table, TableBody, TableCell, TableFooter, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+import { DownloadCsvButton } from "@/components/reports/DownloadCsvButton"
+import { DownloadPdfButton } from "@/components/reports/DownloadPdfButton"
+import { ReportHeader } from "@/components/reports/ReportHeader"
+
+export default function TrialBalancePage() {
+  const [asOfDate, setAsOfDate] = useState(todayIso())
+  const [rows, setRows] = useState<TrialBalanceRow[] | null>(null)
+  const [error, setError] = useState<string | null>(null)
+
+  // Clears stale results the instant asOfDate changes, during the render that reacts to it —
+  // not inside the effect below, which would be a synchronous setState-in-effect
+  // (react-hooks/set-state-in-effect); this is React's own sanctioned "adjust state during
+  // render" pattern instead.
+  const [loadedFor, setLoadedFor] = useState<string | null>(null)
+  if (loadedFor !== asOfDate) {
+    setLoadedFor(asOfDate)
+    setRows(null)
+    setError(null)
+  }
+
+  useEffect(() => {
+    if (!asOfDate) return
+    let cancelled = false
+    reportsApi
+      .trialBalance(asOfDate)
+      .then((res) => {
+        if (!cancelled) setRows(res)
+      })
+      .catch((err) => {
+        if (!cancelled) setError(errorMessage(err))
+      })
+    return () => {
+      cancelled = true
+    }
+  }, [asOfDate])
+
+  const totalDebit = (rows ?? []).reduce((sum, r) => sum + r.debit, 0)
+  const totalCredit = (rows ?? []).reduce((sum, r) => sum + r.credit, 0)
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex items-center gap-3">
+        <Link href="/dashboard/ledgers" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
+          <ArrowLeft className="size-5" />
+        </Link>
+        <div>
+          <h1 className="text-2xl font-bold text-foreground">Trial Balance</h1>
+          <p className="text-base text-muted-foreground">Every postable account&apos;s balance as at a date.</p>
+        </div>
+      </div>
+
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-end sm:justify-between">
+        <div className="flex flex-col gap-1.5">
+          <Label className="text-base">As at</Label>
+          <Input type="date" value={asOfDate} onChange={(e) => setAsOfDate(e.target.value)} className="h-11 w-full text-base sm:w-60" />
+        </div>
+        <div className="flex gap-2">
+          <DownloadPdfButton reportType={ReportType.TrialBalance} params={{ asOfDate }} disabled={!rows} />
+          <DownloadCsvButton reportType={ReportType.TrialBalance} params={{ asOfDate }} disabled={!rows} />
+        </div>
+      </div>
+
+      {error && (
+        <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>
+      )}
+
+      {!error && rows === null && (
+        <div className="flex flex-col gap-3">
+          {Array.from({ length: 6 }).map((_, i) => (
+            <Skeleton key={i} className="h-12 w-full" />
+          ))}
+        </div>
+      )}
+
+      {!error && rows !== null && rows.length === 0 && (
+        <div className="flex flex-col items-center gap-4 rounded-xl border border-dashed py-20 text-center">
+          <Scale className="size-12 text-muted-foreground" />
+          <p className="text-base text-muted-foreground">No postable accounts as at this date.</p>
+        </div>
+      )}
+
+      {!error && rows !== null && rows.length > 0 && (
+        <div className="rounded-2xl bg-white p-6 shadow-sm ring-1 ring-black/5">
+          <ReportHeader title="Trial Balance" subtitle={`As at ${formatReportDate(asOfDate)}`} />
+          <Table className="mt-4 text-base">
+            <TableHeader>
+              <TableRow>
+                <TableHead className="h-11 px-3 text-sm">Account</TableHead>
+                <TableHead className="h-11 px-3 text-right text-sm">Debit</TableHead>
+                <TableHead className="h-11 px-3 text-right text-sm">Credit</TableHead>
+              </TableRow>
+            </TableHeader>
+            <TableBody>
+              {rows.map((row, i) => (
+                <TableRow key={i}>
+                  <TableCell className="px-3 py-2.5">
+                    <span className="text-muted-foreground">{row.accountCode}</span>{" "}
+                    <span>{row.accountName}</span>
+                  </TableCell>
+                  <TableCell className="px-3 py-2.5 text-right tabular-nums">{formatAmount(row.debit, true)}</TableCell>
+                  <TableCell className="px-3 py-2.5 text-right tabular-nums">{formatAmount(row.credit, true)}</TableCell>
+                </TableRow>
+              ))}
+            </TableBody>
+            <TableFooter className="border-t-2 border-foreground/70 bg-transparent">
+              <TableRow className="hover:bg-transparent">
+                <TableCell className="px-3 py-3 font-bold">Total</TableCell>
+                <TableCell className="px-3 py-3 text-right font-bold tabular-nums">{formatAmount(totalDebit)}</TableCell>
+                <TableCell className="px-3 py-3 text-right font-bold tabular-nums">{formatAmount(totalCredit)}</TableCell>
+              </TableRow>
+            </TableFooter>
+          </Table>
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/procurement/purchase-orders/[id]/page.tsx b/Frontend/erp-system/app/dashboard/procurement/purchase-orders/[id]/page.tsx
index 65c6a6b..a51cde1 100644
--- a/Frontend/erp-system/app/dashboard/procurement/purchase-orders/[id]/page.tsx
+++ b/Frontend/erp-system/app/dashboard/procurement/purchase-orders/[id]/page.tsx
@@ -3,8 +3,7 @@
 import { useEffect, useState } from "react"
 import { useParams, useRouter } from "next/navigation"
 import Link from "next/link"
-import { AlertTriangle, ArrowLeft, Ban, Plus, Save, Send, Trash2 } from "lucide-react"
-
+import { AlertTriangle, ArrowLeft, Ban, Check, Plus, Save, Trash2 } from "lucide-react"
 import { isPoEditable, purchaseOrdersApi } from "@/lib/api/purchase-orders"
 import { warehousesApi } from "@/lib/api/warehouses"
 import { itemsApi } from "@/lib/api/items"
@@ -195,10 +194,12 @@ export default function PurchaseOrderDetailPage() {
       const updated = await purchaseOrdersApi.submit(po.poId)
       setPo(updated)
       setLines(toDraftLines(updated))
-      toast.success("Purchase order submitted", `${updated.docNo} — now ${updated.status} and locked for editing.`)
+      toast.success("Purchase order approved", `${updated.docNo} — now ${updated.status} and locked for editing.`)
+      toast.success("Purchase order approved", `${updated.docNo} — now ${updated.status} and locked for editing.`)
     } catch (err) {
       setSaveError(errorMessage(err))
-      toast.error("Could not submit purchase order", errorMessage(err))
+      toast.error("Could not approve purchase order", errorMessage(err))
+      toast.error("Could not approve purchase order", errorMessage(err))
     } finally {
       setSubmitting(false)
     }
@@ -269,9 +270,6 @@ export default function PurchaseOrderDetailPage() {
     <div className="flex flex-col gap-6">
       <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
         <div className="flex items-center gap-3">
-          <Link href="/dashboard/procurement/purchase-orders" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-            <ArrowLeft className="size-5" />
-          </Link>
           <div>
             <div className="flex items-center gap-3">
               <h1 className="text-2xl font-bold text-foreground">{po.docNo}</h1>
@@ -286,9 +284,12 @@ export default function PurchaseOrderDetailPage() {
         <div className="flex flex-wrap items-center gap-3">
           {po.status === "Draft" && (
             <>
-              <Button variant="outline" size="lg" onClick={handleSubmitPo} disabled={submitting || deleting}>
-                <Send className="size-5" />
-                {submitting ? "Submitting…" : "Submit"}
+              <Button variant="success" size="lg" onClick={handleSubmitPo} disabled={submitting || deleting}>
+                <Check className="size-5" />
+                {submitting ? "Approving…" : "Approve"}
+              <Button variant="success" size="lg" onClick={handleSubmitPo} disabled={submitting || deleting}>
+                <Check className="size-5" />
+                {submitting ? "Approving…" : "Approve"}
               </Button>
               <Button variant="destructive" size="lg" onClick={handleDelete} disabled={deleting || submitting}>
                 <Trash2 className="size-5" />
diff --git a/Frontend/erp-system/app/dashboard/procurement/purchase-orders/new/page.tsx b/Frontend/erp-system/app/dashboard/procurement/purchase-orders/new/page.tsx
index f956a5d..3cb9a27 100644
--- a/Frontend/erp-system/app/dashboard/procurement/purchase-orders/new/page.tsx
+++ b/Frontend/erp-system/app/dashboard/procurement/purchase-orders/new/page.tsx
@@ -3,7 +3,7 @@
 import { Suspense, useEffect, useState } from "react"
 import { useRouter, useSearchParams } from "next/navigation"
 import Link from "next/link"
-import { ArrowLeft, Plus, Trash2 } from "lucide-react"
+import { ArrowLeft, ExternalLink, Plus, Trash2 } from "lucide-react"
 
 import { purchaseOrdersApi } from "@/lib/api/purchase-orders"
 import { requisitionsApi } from "@/lib/api/requisitions"
@@ -15,13 +15,22 @@ import { uomsApi } from "@/lib/api/uoms"
 import { errorMessage } from "@/lib/error-map"
 import { validatePoLine } from "@/lib/validations/procurement"
 import { cn } from "@/lib/utils"
+import { generateVendorCode } from "@/lib/vendor-code"
 import { CreatePoLineInput } from "@/types/procurement"
 import { ItemListItem, Uom, Vendor, Warehouse } from "@/types/master-data"
 
 import { Button, buttonVariants } from "@/components/ui/button"
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from "@/components/ui/dialog"
+import { Field, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field"
 import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
-import { FieldError } from "@/components/ui/field"
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
 import { Skeleton } from "@/components/ui/skeleton"
@@ -73,22 +82,83 @@ function NewPurchaseOrderContent() {
   const [submitError, setSubmitError] = useState<string | null>(null)
   const [submitting, setSubmitting] = useState(false)
 
+  const [vendorDialogOpen, setVendorDialogOpen] = useState(false)
+  const [vName, setVName] = useState("")
+  const [vTerms, setVTerms] = useState("")
+  const [vTaxReg, setVTaxReg] = useState("")
+  const [vCurrency, setVCurrency] = useState("LKR")
+  const [vErrors, setVErrors] = useState<Record<string, string>>({})
+  const [vSubmitting, setVSubmitting] = useState(false)
+
+  const generatedVendorCode = vName.trim() ? generateVendorCode(vName, (vendors ?? []).map((v) => v.code)) : ""
+
+  function loadItems() {
+    return itemsApi.list({ pageSize: 200, status: "Active" }).then((it) => setItems(it.items))
+  }
+  function loadVendors() {
+    return vendorsApi.list({ pageSize: 200, status: "Active" }).then((ve) => setVendors(ve.items))
+  }
+
   useEffect(() => {
     Promise.all([
-      itemsApi.list({ pageSize: 200, status: "Active" }),
-      uomsApi.list(),
-      warehousesApi.list(),
-      vendorsApi.list({ pageSize: 200, status: "Active" }),
-    ])
-      .then(([it, uo, wh, ve]) => {
-        setItems(it.items)
-        setUoms(uo.items)
-        setWarehouses(wh.items)
-        setVendors(ve.items)
-      })
-      .catch((err) => setLoadError(errorMessage(err)))
+      loadItems(),
+      uomsApi.list().then((uo) => setUoms(uo.items)),
+      warehousesApi.list().then((wh) => setWarehouses(wh.items)),
+      loadVendors(),
+    ]).catch((err) => setLoadError(errorMessage(err)))
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
+  // A new item is created on the standalone item builder (too many fields for a modal here),
+  // typically in another tab — refetch on refocus so it shows up in the line pickers without
+  // the user having to reload this page and lose their draft.
+  useEffect(() => {
+    function onFocus() {
+      loadItems().catch(() => {})
+    }
+    window.addEventListener("focus", onFocus)
+    return () => window.removeEventListener("focus", onFocus)
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
+
+  function resetVendorForm() {
+    setVName("")
+    setVTerms("")
+    setVTaxReg("")
+    setVCurrency("LKR")
+    setVErrors({})
+  }
+
+  async function handleCreateVendor() {
+    const nextErrors: Record<string, string> = {}
+    if (!vName.trim()) nextErrors.name = "Vendor name is required"
+    if (!vCurrency.trim()) nextErrors.currency = "Currency is required"
+    setVErrors(nextErrors)
+    if (Object.keys(nextErrors).length > 0) return
+
+    setVSubmitting(true)
+    try {
+      const result = await vendorsApi.create({
+        code: generatedVendorCode,
+        name: vName,
+        terms: vTerms || null,
+        taxReg: vTaxReg || null,
+        currency: vCurrency,
+      })
+      await loadVendors()
+      setVendorId(result.data.vendorId)
+      toast.success("Vendor created", `${result.data.code} — ${result.data.name}`)
+      setVendorDialogOpen(false)
+      resetVendorForm()
+    } catch (err) {
+      // A 409 here means another creation raced ours for the same generated code — the
+      // proactive de-dupe above only knows about vendors loaded when the dialog opened.
+      toast.error("Could not create vendor", errorMessage(err))
+    } finally {
+      setVSubmitting(false)
+    }
+  }
+
   useEffect(() => {
     if (requisitionId) {
       requisitionsApi
@@ -221,9 +291,6 @@ function NewPurchaseOrderContent() {
   return (
     <div className="flex flex-col gap-6">
       <div className="flex items-center gap-3">
-        <Link href="/dashboard/procurement/purchase-orders" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-          <ArrowLeft className="size-5" />
-        </Link>
         <div>
           <h1 className="text-2xl font-bold text-foreground">New Purchase Order</h1>
           <p className="text-base text-muted-foreground">Auto-approved on creation; freely editable while open (FR-PROC-03..05).</p>
@@ -239,43 +306,72 @@ function NewPurchaseOrderContent() {
       {!loading && (
         <>
           <div className="grid grid-cols-1 gap-4 sm:grid-cols-4">
-            <div className="flex flex-col gap-2">
-              <Label className="text-base">Vendor code</Label>
-              <Select<number | null>
-                value={vendorId}
-                onValueChange={setVendorId}
-                items={(vendors ?? []).map((v) => ({ label: v.code, value: v.vendorId }))}
-              >
-                <SelectTrigger className="h-12! w-full text-base">
-                  <SelectValue placeholder="Select vendor code" />
-                </SelectTrigger>
-                <SelectContent>
-                  {(vendors ?? []).map((v) => (
-                    <SelectItem key={v.vendorId} value={v.vendorId} className="text-base">
-                      {v.code}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-            </div>
-            <div className="flex flex-col gap-2">
-              <Label className="text-base">Vendor name</Label>
-              <Select<number | null>
-                value={vendorId}
-                onValueChange={setVendorId}
-                items={(vendors ?? []).map((v) => ({ label: v.name, value: v.vendorId }))}
-              >
-                <SelectTrigger className="h-12! w-full text-base">
-                  <SelectValue placeholder="Select vendor name" />
-                </SelectTrigger>
-                <SelectContent>
-                  {(vendors ?? []).map((v) => (
-                    <SelectItem key={v.vendorId} value={v.vendorId} className="text-base">
-                      {v.name}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
+            <div className="flex flex-col gap-2 sm:col-span-2">
+              <Label className="text-base">Vendor</Label>
+              <div className="flex items-center gap-2">
+                <Select<number | null>
+                  value={vendorId}
+                  onValueChange={setVendorId}
+                  items={(vendors ?? []).map((v) => ({ label: `${v.code} — ${v.name}`, value: v.vendorId }))}
+                >
+                  <SelectTrigger className="h-12! w-full text-base">
+                    <SelectValue placeholder="Select vendor" />
+                  </SelectTrigger>
+                  <SelectContent>
+                    {(vendors ?? []).map((v) => (
+                      <SelectItem key={v.vendorId} value={v.vendorId} className="text-base">
+                        {v.code} — {v.name}
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+
+                <Dialog open={vendorDialogOpen} onOpenChange={(o) => { setVendorDialogOpen(o); if (!o) resetVendorForm() }}>
+                  <DialogTrigger
+                    render={<Button type="button" variant="outline" size="icon-lg" aria-label="New vendor" title="New vendor" />}
+                  >
+                    <Plus className="size-5" />
+                  </DialogTrigger>
+                  <DialogContent className="sm:max-w-md">
+                    <DialogHeader className="items-center text-center">
+                      <DialogTitle>New vendor</DialogTitle>
+                      <DialogDescription>Create a supplier record without leaving this PO. Its code is generated from the name.</DialogDescription>
+                    </DialogHeader>
+                    <FieldGroup>
+                      <Field data-invalid={!!vErrors.name}>
+                        <FieldLabel htmlFor="po-v-name">Name</FieldLabel>
+                        <Input id="po-v-name" value={vName} onChange={(e) => setVName(e.target.value)} placeholder="Lanka Steel Traders (Pvt) Ltd" aria-invalid={!!vErrors.name} />
+                        <FieldError errors={[vErrors.name ? { message: vErrors.name } : undefined]} />
+                      </Field>
+                      <Field>
+                        <FieldLabel htmlFor="po-v-code">Code (auto-generated)</FieldLabel>
+                        <Input id="po-v-code" value={generatedVendorCode} readOnly disabled placeholder="Enter a name to generate a code" className="text-muted-foreground" />
+                      </Field>
+                      <Field>
+                        <FieldLabel htmlFor="po-v-terms">Payment terms (optional)</FieldLabel>
+                        <Input id="po-v-terms" value={vTerms} onChange={(e) => setVTerms(e.target.value)} placeholder="NET30" />
+                      </Field>
+                      <Field>
+                        <FieldLabel htmlFor="po-v-taxreg">Tax registration (optional)</FieldLabel>
+                        <Input id="po-v-taxreg" value={vTaxReg} onChange={(e) => setVTaxReg(e.target.value)} placeholder="134567890-7000" />
+                      </Field>
+                      <Field data-invalid={!!vErrors.currency}>
+                        <FieldLabel htmlFor="po-v-currency">Currency</FieldLabel>
+                        <Input id="po-v-currency" value={vCurrency} onChange={(e) => setVCurrency(e.target.value)} placeholder="LKR" maxLength={3} aria-invalid={!!vErrors.currency} />
+                        <FieldError errors={[vErrors.currency ? { message: vErrors.currency } : undefined]} />
+                      </Field>
+                    </FieldGroup>
+                    <div className="flex flex-col-reverse gap-3 pt-2 sm:flex-row sm:justify-center">
+                      <Button variant="outline" className="w-full sm:w-auto sm:min-w-36" onClick={() => setVendorDialogOpen(false)} disabled={vSubmitting}>
+                        Cancel
+                      </Button>
+                      <Button className="w-full sm:w-auto sm:min-w-36" onClick={handleCreateVendor} disabled={vSubmitting}>
+                        {vSubmitting ? "Creating…" : "Create"}
+                      </Button>
+                    </div>
+                  </DialogContent>
+                </Dialog>
+              </div>
             </div>
             {requisitionId && (
               <div className="flex flex-col justify-end pb-2.5 text-sm text-muted-foreground">From Requisition #{requisitionId}</div>
@@ -290,10 +386,22 @@ function NewPurchaseOrderContent() {
           <div className="flex flex-col gap-3">
             <div className="flex items-center justify-between">
               <h2 className="text-base font-semibold text-foreground">Lines</h2>
-              <Button type="button" variant="outline" onClick={() => setLines((prev) => [...prev, emptyLine()])}>
-                <Plus className="size-5" />
-                Add line
-              </Button>
+              <div className="flex items-center gap-2">
+                <Link
+                  href="/dashboard/products/new"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  className={cn(buttonVariants({ variant: "outline" }))}
+                  title="Opens in a new tab — the item list here refreshes when you come back"
+                >
+                  <ExternalLink className="size-5" />
+                  New item
+                </Link>
+                <Button type="button" variant="outline" onClick={() => setLines((prev) => [...prev, emptyLine()])}>
+                  <Plus className="size-5" />
+                  Add line
+                </Button>
+              </div>
             </div>
 
             {lines.length > 0 && (
diff --git a/Frontend/erp-system/app/dashboard/procurement/purchase-orders/page.tsx b/Frontend/erp-system/app/dashboard/procurement/purchase-orders/page.tsx
index bf4b352..7676f2e 100644
--- a/Frontend/erp-system/app/dashboard/procurement/purchase-orders/page.tsx
+++ b/Frontend/erp-system/app/dashboard/procurement/purchase-orders/page.tsx
@@ -2,9 +2,9 @@
 
 import { useEffect, useState } from "react"
 import Link from "next/link"
-import { ChevronLeft, ChevronRight, Plus, ShoppingCart } from "lucide-react"
+import { Check, ChevronLeft, ChevronRight, Eye, Pencil, Plus, ShoppingCart, Trash2 } from "lucide-react"
 
-import { purchaseOrdersApi } from "@/lib/api/purchase-orders"
+import { isPoEditable, purchaseOrdersApi } from "@/lib/api/purchase-orders"
 import { vendorsApi } from "@/lib/api/vendors"
 import { errorMessage } from "@/lib/error-map"
 import { PurchaseOrderStatus, PurchaseOrderSummary } from "@/types/procurement"
@@ -16,6 +16,7 @@ import { Input } from "@/components/ui/input"
 import { Skeleton } from "@/components/ui/skeleton"
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+import { toast } from "@/components/ui/toast"
 import { PoStatusBadge } from "@/components/procurement/status-badges"
 
 type StatusFilter = PurchaseOrderStatus | "All"
@@ -32,6 +33,8 @@ export default function PurchaseOrdersListPage() {
   const [query, setQuery] = useState("")
   const [status, setStatus] = useState<StatusFilter>("All")
   const [page, setPage] = useState(1)
+  const [deletingId, setDeletingId] = useState<number | null>(null)
+  const [approvingId, setApprovingId] = useState<number | null>(null)
 
   useEffect(() => {
     const timeout = setTimeout(() => setQuery(searchInput.trim()), 300)
@@ -60,6 +63,34 @@ export default function PurchaseOrdersListPage() {
     return vendors.find((v) => v.vendorId === vendorId)?.code ?? `#${vendorId}`
   }
 
+  async function handleDelete(po: PurchaseOrderSummary) {
+    if (!window.confirm(`Delete draft ${po.docNo}? This cannot be undone.`)) return
+    setDeletingId(po.poId)
+    try {
+      await purchaseOrdersApi.remove(po.poId)
+      toast.success("Draft deleted", po.docNo)
+      load()
+    } catch (err) {
+      toast.error("Could not delete purchase order", errorMessage(err))
+    } finally {
+      setDeletingId(null)
+    }
+  }
+
+  async function handleApprove(po: PurchaseOrderSummary) {
+    if (!window.confirm(`Approve ${po.docNo}? It will be locked for editing once approved.`)) return
+    setApprovingId(po.poId)
+    try {
+      const updated = await purchaseOrdersApi.submit(po.poId)
+      toast.success("Purchase order approved", `${updated.docNo} — now ${updated.status}.`)
+      load()
+    } catch (err) {
+      toast.error("Could not approve purchase order", errorMessage(err))
+    } finally {
+      setApprovingId(null)
+    }
+  }
+
   const hasFilters = query.length > 0 || status !== "All"
 
   return (
@@ -133,24 +164,76 @@ export default function PurchaseOrdersListPage() {
                 <TableHead className="h-12 px-3 text-sm">Status</TableHead>
                 <TableHead className="h-12 px-3 text-sm">Grand total</TableHead>
                 <TableHead className="h-12 px-3 text-sm">Created</TableHead>
+                <TableHead className="h-12 w-44 px-3 text-sm">Actions</TableHead>
               </TableRow>
             </TableHeader>
             <TableBody>
-              {pos.map((po) => (
-                <TableRow key={po.poId}>
-                  <TableCell className="px-3 py-3.5">
-                    <Link href={`/dashboard/procurement/purchase-orders/${po.poId}`} className="font-medium text-foreground hover:underline">
-                      {po.docNo}
-                    </Link>
-                  </TableCell>
-                  <TableCell className="px-3 py-3.5">{vendorCode(po.vendorId)}</TableCell>
-                  <TableCell className="px-3 py-3.5">
-                    <PoStatusBadge status={po.status} />
-                  </TableCell>
-                  <TableCell className="px-3 py-3.5">{po.totals.currency} {po.totals.grandTotal.toFixed(2)}</TableCell>
-                  <TableCell className="px-3 py-3.5">{new Date(po.createdAt).toLocaleString()}</TableCell>
-                </TableRow>
-              ))}
+              {pos.map((po) => {
+                const editable = isPoEditable(po.status)
+                return (
+                  <TableRow key={po.poId}>
+                    <TableCell className="px-3 py-3.5">
+                      <Link href={`/dashboard/procurement/purchase-orders/${po.poId}`} className="font-medium text-foreground hover:underline">
+                        {po.docNo}
+                      </Link>
+                    </TableCell>
+                    <TableCell className="px-3 py-3.5">{vendorCode(po.vendorId)}</TableCell>
+                    <TableCell className="px-3 py-3.5">
+                      <PoStatusBadge status={po.status} />
+                    </TableCell>
+                    <TableCell className="px-3 py-3.5">{po.totals.currency} {po.totals.grandTotal.toFixed(2)}</TableCell>
+                    <TableCell className="px-3 py-3.5">{new Date(po.createdAt).toLocaleString()}</TableCell>
+                    <TableCell className="px-3 py-3.5">
+                      <div className="flex items-center gap-1">
+                        <Link
+                          href={`/dashboard/procurement/purchase-orders/${po.poId}`}
+                          className={cn(buttonVariants({ variant: "ghost", size: "icon" }))}
+                          aria-label="View"
+                          title="View"
+                        >
+                          <Eye className="size-4" />
+                        </Link>
+                        {editable && (
+                          <>
+                            <Link
+                              href={`/dashboard/procurement/purchase-orders/${po.poId}`}
+                              className={cn(buttonVariants({ variant: "ghost", size: "icon" }))}
+                              aria-label="Edit draft"
+                              title="Edit draft"
+                            >
+                              <Pencil className="size-4" />
+                            </Link>
+                            <Button
+                              type="button"
+                              variant="ghost"
+                              size="icon"
+                              aria-label="Approve draft"
+                              title="Approve draft"
+                              disabled={approvingId === po.poId || deletingId === po.poId}
+                              onClick={() => handleApprove(po)}
+                              className="text-success hover:bg-success/10 hover:text-success"
+                            >
+                              <Check className="size-4" />
+                            </Button>
+                            <Button
+                              type="button"
+                              variant="ghost"
+                              size="icon"
+                              aria-label="Delete draft"
+                              title="Delete draft"
+                              disabled={deletingId === po.poId || approvingId === po.poId}
+                              onClick={() => handleDelete(po)}
+                              className="text-destructive hover:bg-destructive/10 hover:text-destructive"
+                            >
+                              <Trash2 className="size-4" />
+                            </Button>
+                          </>
+                        )}
+                      </div>
+                    </TableCell>
+                  </TableRow>
+                )
+              })}
             </TableBody>
           </Table>
 
diff --git a/Frontend/erp-system/app/dashboard/procurement/purchase-returns/new/page.tsx b/Frontend/erp-system/app/dashboard/procurement/purchase-returns/new/page.tsx
index 324cfe1..4c4370b 100644
--- a/Frontend/erp-system/app/dashboard/procurement/purchase-returns/new/page.tsx
+++ b/Frontend/erp-system/app/dashboard/procurement/purchase-returns/new/page.tsx
@@ -3,7 +3,7 @@
 import { Suspense, useEffect, useState } from "react"
 import { useRouter, useSearchParams } from "next/navigation"
 import Link from "next/link"
-import { ArrowLeft } from "lucide-react"
+import {} from "lucide-react"
 
 import { purchaseReturnsApi } from "@/lib/api/purchase-returns"
 import { grnsApi } from "@/lib/api/grns"
@@ -156,9 +156,6 @@ function NewPurchaseReturnContent() {
   return (
     <div className="flex flex-col gap-6">
       <div className="flex items-center gap-3">
-        <Link href="/dashboard/procurement/purchase-returns" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-          <ArrowLeft className="size-5" />
-        </Link>
         <div>
           <h1 className="text-2xl font-bold text-foreground">New Purchase Return</h1>
           <p className="text-base text-muted-foreground">Return received goods to the vendor; posts an outbound ledger entry immediately (FR-PROC-08).</p>
diff --git a/Frontend/erp-system/app/dashboard/procurement/requisitions/[id]/page.tsx b/Frontend/erp-system/app/dashboard/procurement/requisitions/[id]/page.tsx
index e74c1b8..51fec29 100644
--- a/Frontend/erp-system/app/dashboard/procurement/requisitions/[id]/page.tsx
+++ b/Frontend/erp-system/app/dashboard/procurement/requisitions/[id]/page.tsx
@@ -3,7 +3,7 @@
 import { useEffect, useState } from "react"
 import { useParams } from "next/navigation"
 import Link from "next/link"
-import { ArrowLeft, FileText, Send, ShoppingCart } from "lucide-react"
+import { FileText, Send, ShoppingCart } from "lucide-react"
 
 import { requisitionsApi } from "@/lib/api/requisitions"
 import { itemsApi } from "@/lib/api/items"
@@ -74,9 +74,6 @@ export default function RequisitionDetailPage() {
     <div className="flex flex-col gap-6">
       <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
         <div className="flex items-center gap-3">
-          <Link href="/dashboard/procurement/requisitions" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-            <ArrowLeft className="size-5" />
-          </Link>
           <div>
             <div className="flex items-center gap-3">
               <h1 className="text-2xl font-bold text-foreground">{requisition.docNo}</h1>
diff --git a/Frontend/erp-system/app/dashboard/procurement/requisitions/new/page.tsx b/Frontend/erp-system/app/dashboard/procurement/requisitions/new/page.tsx
index a6143d3..b15f1dc 100644
--- a/Frontend/erp-system/app/dashboard/procurement/requisitions/new/page.tsx
+++ b/Frontend/erp-system/app/dashboard/procurement/requisitions/new/page.tsx
@@ -3,7 +3,7 @@
 import { useEffect, useState } from "react"
 import { useRouter } from "next/navigation"
 import Link from "next/link"
-import { ArrowLeft, Plus, Trash2 } from "lucide-react"
+import { Plus, Trash2 } from "lucide-react"
 
 import { requisitionsApi } from "@/lib/api/requisitions"
 import { itemsApi } from "@/lib/api/items"
@@ -103,9 +103,6 @@ export default function NewRequisitionPage() {
   return (
     <div className="flex flex-col gap-6">
       <div className="flex items-center gap-3">
-        <Link href="/dashboard/procurement/requisitions" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-          <ArrowLeft className="size-5" />
-        </Link>
         <div>
           <h1 className="text-2xl font-bold text-foreground">New Requisition</h1>
           <p className="text-base text-muted-foreground">Request items for procurement; submit once the lines are ready (FR-PROC-01).</p>
diff --git a/Frontend/erp-system/app/dashboard/procurement/rfqs/[id]/page.tsx b/Frontend/erp-system/app/dashboard/procurement/rfqs/[id]/page.tsx
index ea3de47..1c4ddaf 100644
--- a/Frontend/erp-system/app/dashboard/procurement/rfqs/[id]/page.tsx
+++ b/Frontend/erp-system/app/dashboard/procurement/rfqs/[id]/page.tsx
@@ -3,7 +3,7 @@
 import { useEffect, useMemo, useState } from "react"
 import { useParams } from "next/navigation"
 import Link from "next/link"
-import { ArrowLeft, ShoppingCart } from "lucide-react"
+import { ShoppingCart } from "lucide-react"
 
 import { rfqsApi } from "@/lib/api/rfqs"
 import { vendorsApi } from "@/lib/api/vendors"
@@ -158,9 +158,6 @@ export default function RfqDetailPage() {
   return (
     <div className="flex flex-col gap-6">
       <div className="flex items-center gap-3">
-        <Link href="/dashboard/procurement/rfqs" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-          <ArrowLeft className="size-5" />
-        </Link>
         <div>
           <div className="flex items-center gap-3">
             <h1 className="text-2xl font-bold text-foreground">{rfq.docNo}</h1>
diff --git a/Frontend/erp-system/app/dashboard/procurement/rfqs/new/page.tsx b/Frontend/erp-system/app/dashboard/procurement/rfqs/new/page.tsx
index cfb8bcb..c7bc58f 100644
--- a/Frontend/erp-system/app/dashboard/procurement/rfqs/new/page.tsx
+++ b/Frontend/erp-system/app/dashboard/procurement/rfqs/new/page.tsx
@@ -3,7 +3,7 @@
 import { Suspense, useEffect, useState } from "react"
 import { useRouter, useSearchParams } from "next/navigation"
 import Link from "next/link"
-import { ArrowLeft, Plus, Trash2 } from "lucide-react"
+import { Plus, Trash2 } from "lucide-react"
 
 import { rfqsApi } from "@/lib/api/rfqs"
 import { requisitionsApi } from "@/lib/api/requisitions"
@@ -149,9 +149,6 @@ function NewRfqContent() {
   return (
     <div className="flex flex-col gap-6">
       <div className="flex items-center gap-3">
-        <Link href="/dashboard/procurement/rfqs" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-          <ArrowLeft className="size-5" />
-        </Link>
         <div>
           <h1 className="text-2xl font-bold text-foreground">New RFQ</h1>
           <p className="text-base text-muted-foreground">
diff --git a/Frontend/erp-system/app/dashboard/production/templates/[id]/StageEditorPanel.tsx b/Frontend/erp-system/app/dashboard/production/templates/[id]/StageEditorPanel.tsx
index 825740d..613f95b 100644
--- a/Frontend/erp-system/app/dashboard/production/templates/[id]/StageEditorPanel.tsx
+++ b/Frontend/erp-system/app/dashboard/production/templates/[id]/StageEditorPanel.tsx
@@ -1,6 +1,6 @@
 "use client"
 
-import { Plus, Trash2, X } from "lucide-react"
+import { Plus, Trash2 } from "lucide-react"
 
 import { cn } from "@/lib/utils"
 import { CustomFieldType, StageInputSource } from "@/types/production"
@@ -15,6 +15,7 @@ import {
 } from "./types"
 
 import { Button } from "@/components/ui/button"
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog"
 import { Field, FieldLabel } from "@/components/ui/field"
 import { Input } from "@/components/ui/input"
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
@@ -175,265 +176,264 @@ export function StageEditorPanel({
   }
 
   return (
-    <div className="flex h-full w-full flex-col overflow-y-auto rounded-2xl bg-card p-4 shadow-sm ring-1 ring-foreground/10 sm:w-96">
-      <div className="mb-4 flex items-center justify-between">
-        <h2 className="text-base font-bold text-foreground">Stage editor</h2>
-        <button type="button" onClick={onClose} className="text-muted-foreground hover:text-foreground" aria-label="Close panel">
-          <X className="size-5" />
-        </button>
-      </div>
+    <Dialog open onOpenChange={(next) => !next && onClose()}>
+      <DialogContent className="max-h-[85vh] w-full max-w-lg overflow-y-auto sm:max-w-lg">
+        <DialogHeader>
+          <DialogTitle>Stage editor</DialogTitle>
+        </DialogHeader>
 
-      <div className="flex flex-col gap-4">
-        <Field>
-          <FieldLabel>Name</FieldLabel>
-          <Input value={data.name} disabled={readOnly} onChange={(e) => onChange({ name: e.target.value })} placeholder="e.g. Welding" />
-        </Field>
+        <div className="flex flex-col gap-4">
+          <Field>
+            <FieldLabel>Name</FieldLabel>
+            <Input value={data.name} disabled={readOnly} onChange={(e) => onChange({ name: e.target.value })} placeholder="e.g. Welding" />
+          </Field>
 
-        <Field>
-          <FieldLabel>Role label</FieldLabel>
-          <Input
-            value={data.roleLabel}
-            disabled={readOnly}
-            onChange={(e) => onChange({ roleLabel: e.target.value })}
-            placeholder="e.g. QA"
-            list="role-suggestions"
-          />
-          <datalist id="role-suggestions">
-            {ROLE_SUGGESTIONS.map((r) => (
-              <option key={r} value={r} />
-            ))}
-          </datalist>
-        </Field>
+          <Field>
+            <FieldLabel>Role label</FieldLabel>
+            <Input
+              value={data.roleLabel}
+              disabled={readOnly}
+              onChange={(e) => onChange({ roleLabel: e.target.value })}
+              placeholder="e.g. QA"
+              list="role-suggestions"
+            />
+            <datalist id="role-suggestions">
+              {ROLE_SUGGESTIONS.map((r) => (
+                <option key={r} value={r} />
+              ))}
+            </datalist>
+          </Field>
 
-        <Field>
-          <FieldLabel>Estimated minutes</FieldLabel>
-          <Input
-            type="number"
-            min={0}
-            value={data.estimatedMinutes}
-            disabled={readOnly}
-            onChange={(e) => onChange({ estimatedMinutes: Number(e.target.value) || 0 })}
-          />
-        </Field>
+          <Field>
+            <FieldLabel>Estimated minutes</FieldLabel>
+            <Input
+              type="number"
+              min={0}
+              value={data.estimatedMinutes}
+              disabled={readOnly}
+              onChange={(e) => onChange({ estimatedMinutes: Number(e.target.value) || 0 })}
+            />
+          </Field>
 
-        {/* Inputs */}
-        <div>
-          <div className="mb-2 flex items-center justify-between">
-            <p className="text-sm font-semibold text-foreground">Inputs</p>
-            {!readOnly && (
-              <Button type="button" variant="ghost" size="sm" onClick={addInput}>
-                <Plus className="size-4" />
-                Add
-              </Button>
-            )}
-          </div>
-          <div className="flex flex-col gap-2">
-            {data.inputs.length === 0 && <p className="text-sm text-muted-foreground">No inputs yet.</p>}
-            {data.inputs.map((input) => (
-              <div key={input.localId} className="rounded-lg border border-border p-2.5">
-                <div className="mb-2 flex items-center justify-between gap-2">
-                  <Select<StageInputSource>
-                    value={input.source}
-                    onValueChange={(v) => v && changeInputSource(input.localId, v)}
-                  >
-                    <SelectTrigger className="h-8! flex-1 text-sm" disabled={readOnly}>
-                      <SelectValue />
-                    </SelectTrigger>
-                    <SelectContent>
-                      <SelectItem value="Stock" className="text-sm">Stock</SelectItem>
-                      <SelectItem value="Upstream" className="text-sm">Upstream</SelectItem>
-                    </SelectContent>
-                  </Select>
-                  {!readOnly && (
-                    <button type="button" onClick={() => removeInput(input.localId)} className="shrink-0 text-muted-foreground hover:text-destructive" aria-label="Remove input">
-                      <Trash2 className="size-4" />
-                    </button>
-                  )}
-                </div>
-
-                <div className="flex flex-col gap-2">
-                  {input.source === "Stock" ? (
-                    <Select<number>
-                      value={input.itemId}
-                      onValueChange={(v) => v && pickInputItem(input, v)}
+          {/* Inputs */}
+          <div>
+            <div className="mb-2 flex items-center justify-between">
+              <p className="text-sm font-semibold text-foreground">Inputs</p>
+              {!readOnly && (
+                <Button type="button" variant="ghost" size="sm" onClick={addInput}>
+                  <Plus className="size-4" />
+                  Add
+                </Button>
+              )}
+            </div>
+            <div className="flex flex-col gap-2">
+              {data.inputs.length === 0 && <p className="text-sm text-muted-foreground">No inputs yet.</p>}
+              {data.inputs.map((input) => (
+                <div key={input.localId} className="rounded-lg border border-border p-2.5">
+                  <div className="mb-2 flex items-center justify-between gap-2">
+                    <Select<StageInputSource>
+                      value={input.source}
+                      onValueChange={(v) => v && changeInputSource(input.localId, v)}
                     >
-                      <SelectTrigger className="h-8! w-full text-sm" disabled={readOnly}>
-                        <SelectValue placeholder="Pick an item" />
-                      </SelectTrigger>
-                      <SelectContent>
-                        {items.map((i) => (
-                          <SelectItem key={i.itemId} value={i.itemId} className="text-sm">
-                            {i.name} · {i.sku}
-                          </SelectItem>
-                        ))}
-                      </SelectContent>
-                    </Select>
-                  ) : (
-                    <Select<string>
-                      value={input.fromOutputKey}
-                      onValueChange={(v) => v && updateInput(input.localId, { fromOutputKey: v })}
-                    >
-                      <SelectTrigger className="h-8! w-full text-sm" disabled={readOnly || upstreamOptions.length === 0}>
-                        <SelectValue placeholder={upstreamOptions.length === 0 ? "No upstream stages connected" : "Pick an upstream output"} />
-                      </SelectTrigger>
-                      <SelectContent>
-                        {upstreamOptions.map((o) => (
-                          <SelectItem key={o.outputKey} value={o.outputKey} className="text-sm">
-                            {o.stageName} — {o.outputName}
-                          </SelectItem>
-                        ))}
-                      </SelectContent>
-                    </Select>
-                  )}
-
-                  <QtyRow
-                    qty={input.qtyPerBatch}
-                    uomId={input.uomId}
-                    uoms={uoms}
-                    readOnly={readOnly}
-                    onQtyChange={(qtyPerBatch) => updateInput(input.localId, { qtyPerBatch })}
-                    onUomChange={(uomId) => updateInput(input.localId, { uomId })}
-                  />
-                </div>
-              </div>
-            ))}
-          </div>
-        </div>
-
-        {/* Outputs */}
-        <div>
-          <div className="mb-2 flex items-center justify-between">
-            <p className="text-sm font-semibold text-foreground">
-              Outputs{isTerminal && <span className="ml-1.5 font-normal text-muted-foreground">(terminal — finished good)</span>}
-            </p>
-            {!readOnly && (
-              <Button type="button" variant="ghost" size="sm" onClick={addOutput}>
-                <Plus className="size-4" />
-                Add
-              </Button>
-            )}
-          </div>
-          <div className="flex flex-col gap-2">
-            {data.outputs.length === 0 && <p className="text-sm text-muted-foreground">No outputs yet.</p>}
-            {data.outputs.map((output) => (
-              <div key={output.key} className="rounded-lg border border-border p-2.5">
-                <div className="mb-2 flex items-center gap-2">
-                  {isTerminal ? (
-                    <Select<number> value={output.itemId} onValueChange={(v) => v && pickOutputItem(output, v)}>
                       <SelectTrigger className="h-8! flex-1 text-sm" disabled={readOnly}>
-                        <SelectValue placeholder="Pick the finished-good item" />
+                        <SelectValue />
                       </SelectTrigger>
                       <SelectContent>
-                        {items.map((i) => (
-                          <SelectItem key={i.itemId} value={i.itemId} className="text-sm">
-                            {i.name} · {i.sku}
-                          </SelectItem>
-                        ))}
+                        <SelectItem value="Stock" className="text-sm">Stock</SelectItem>
+                        <SelectItem value="Upstream" className="text-sm">Upstream</SelectItem>
                       </SelectContent>
                     </Select>
-                  ) : (
-                    <Input
-                      value={output.name}
-                      disabled={readOnly}
-                      onChange={(e) => updateOutput(output.key, { name: e.target.value })}
-                      placeholder="Output name (work in progress)"
-                      className="h-8 flex-1 text-sm"
-                    />
-                  )}
-                  {!readOnly && (
-                    <button type="button" onClick={() => removeOutput(output.key)} className="shrink-0 text-muted-foreground hover:text-destructive" aria-label="Remove output">
-                      <Trash2 className="size-4" />
-                    </button>
-                  )}
-                </div>
-                <QtyRow
-                  qty={output.qtyPerBatch}
-                  uomId={output.uomId}
-                  uoms={uoms}
-                  readOnly={readOnly}
-                  onQtyChange={(qtyPerBatch) => updateOutput(output.key, { qtyPerBatch })}
-                  onUomChange={(uomId) => updateOutput(output.key, { uomId })}
-                />
-              </div>
-            ))}
-          </div>
-        </div>
+                    {!readOnly && (
+                      <button type="button" onClick={() => removeInput(input.localId)} className="shrink-0 text-muted-foreground hover:text-destructive" aria-label="Remove input">
+                        <Trash2 className="size-4" />
+                      </button>
+                    )}
+                  </div>
 
-        {/* Custom fields */}
-        <div>
-          <div className="mb-2 flex items-center justify-between">
-            <p className="text-sm font-semibold text-foreground">Custom fields</p>
-            {!readOnly && (
-              <Button type="button" variant="ghost" size="sm" onClick={addField}>
-                <Plus className="size-4" />
-                Add
-              </Button>
-            )}
-          </div>
-          <div className="flex flex-col gap-2">
-            {data.fieldDefs.length === 0 && <p className="text-sm text-muted-foreground">No custom fields.</p>}
-            {data.fieldDefs.map((field) => (
-              <div key={field.localId} className="rounded-lg border border-border p-2.5">
-                <div className="mb-2 flex items-center gap-2">
-                  <Input
-                    value={field.label}
-                    disabled={readOnly}
-                    onChange={(e) => updateField(field.localId, { label: e.target.value })}
-                    placeholder="Label"
-                    className="h-8 flex-1 text-sm"
-                  />
-                  {!readOnly && (
-                    <button type="button" onClick={() => removeField(field.localId)} className="shrink-0 text-muted-foreground hover:text-destructive" aria-label="Remove field">
-                      <Trash2 className="size-4" />
-                    </button>
-                  )}
-                </div>
-                {field.key && <p className="mb-2 font-mono text-xs text-muted-foreground">key: {field.key}</p>}
-                <div className="flex items-center gap-2">
-                  <Select<CustomFieldType>
-                    value={field.type}
-                    onValueChange={(v) => v && updateField(field.localId, { type: v })}
-                  >
-                    <SelectTrigger className="h-8! flex-1 text-sm" disabled={readOnly}>
-                      <SelectValue />
-                    </SelectTrigger>
-                    <SelectContent>
-                      {FIELD_TYPES.map((t) => (
-                        <SelectItem key={t} value={t} className="text-sm">{t}</SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
-                  <div className="flex items-center gap-1.5">
-                    <Switch
-                      size="sm"
-                      checked={field.required}
-                      disabled={readOnly}
-                      onCheckedChange={(checked) => updateField(field.localId, { required: checked })}
+                  <div className="flex flex-col gap-2">
+                    {input.source === "Stock" ? (
+                      <Select<number>
+                        value={input.itemId}
+                        onValueChange={(v) => v && pickInputItem(input, v)}
+                      >
+                        <SelectTrigger className="h-8! w-full text-sm" disabled={readOnly}>
+                          <SelectValue placeholder="Pick an item" />
+                        </SelectTrigger>
+                        <SelectContent>
+                          {items.map((i) => (
+                            <SelectItem key={i.itemId} value={i.itemId} className="text-sm">
+                              {i.name} · {i.sku}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
+                    ) : (
+                      <Select<string>
+                        value={input.fromOutputKey}
+                        onValueChange={(v) => v && updateInput(input.localId, { fromOutputKey: v })}
+                      >
+                        <SelectTrigger className="h-8! w-full text-sm" disabled={readOnly || upstreamOptions.length === 0}>
+                          <SelectValue placeholder={upstreamOptions.length === 0 ? "No upstream stages connected" : "Pick an upstream output"} />
+                        </SelectTrigger>
+                        <SelectContent>
+                          {upstreamOptions.map((o) => (
+                            <SelectItem key={o.outputKey} value={o.outputKey} className="text-sm">
+                              {o.stageName} — {o.outputName}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
+                    )}
+
+                    <QtyRow
+                      qty={input.qtyPerBatch}
+                      uomId={input.uomId}
+                      uoms={uoms}
+                      readOnly={readOnly}
+                      onQtyChange={(qtyPerBatch) => updateInput(input.localId, { qtyPerBatch })}
+                      onUomChange={(uomId) => updateInput(input.localId, { uomId })}
                     />
-                    <span className="text-xs text-muted-foreground">Required</span>
                   </div>
                 </div>
-                {field.type === "Select" && (
-                  <Input
-                    value={field.options.join(", ")}
-                    disabled={readOnly}
-                    onChange={(e) => updateField(field.localId, { options: e.target.value.split(",").map((s) => s.trim()).filter(Boolean) })}
-                    placeholder="Options, comma separated"
-                    className="mt-2 h-8 text-sm"
-                  />
-                )}
-              </div>
-            ))}
+              ))}
+            </div>
           </div>
-        </div>
 
-        {!readOnly && (
-          <Button type="button" variant="outline" className={cn("mt-2 text-destructive hover:bg-destructive/10")} onClick={onDelete}>
-            <Trash2 className="size-4" />
-            Delete stage
-          </Button>
-        )}
-      </div>
-    </div>
+          {/* Outputs */}
+          <div>
+            <div className="mb-2 flex items-center justify-between">
+              <p className="text-sm font-semibold text-foreground">
+                Outputs{isTerminal && <span className="ml-1.5 font-normal text-muted-foreground">(terminal — finished good)</span>}
+              </p>
+              {!readOnly && (
+                <Button type="button" variant="ghost" size="sm" onClick={addOutput}>
+                  <Plus className="size-4" />
+                  Add
+                </Button>
+              )}
+            </div>
+            <div className="flex flex-col gap-2">
+              {data.outputs.length === 0 && <p className="text-sm text-muted-foreground">No outputs yet.</p>}
+              {data.outputs.map((output) => (
+                <div key={output.key} className="rounded-lg border border-border p-2.5">
+                  <div className="mb-2 flex items-center gap-2">
+                    {isTerminal ? (
+                      <Select<number> value={output.itemId} onValueChange={(v) => v && pickOutputItem(output, v)}>
+                        <SelectTrigger className="h-8! flex-1 text-sm" disabled={readOnly}>
+                          <SelectValue placeholder="Pick the finished-good item" />
+                        </SelectTrigger>
+                        <SelectContent>
+                          {items.map((i) => (
+                            <SelectItem key={i.itemId} value={i.itemId} className="text-sm">
+                              {i.name} · {i.sku}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
+                    ) : (
+                      <Input
+                        value={output.name}
+                        disabled={readOnly}
+                        onChange={(e) => updateOutput(output.key, { name: e.target.value })}
+                        placeholder="Output name (work in progress)"
+                        className="h-8 flex-1 text-sm"
+                      />
+                    )}
+                    {!readOnly && (
+                      <button type="button" onClick={() => removeOutput(output.key)} className="shrink-0 text-muted-foreground hover:text-destructive" aria-label="Remove output">
+                        <Trash2 className="size-4" />
+                      </button>
+                    )}
+                  </div>
+                  <QtyRow
+                    qty={output.qtyPerBatch}
+                    uomId={output.uomId}
+                    uoms={uoms}
+                    readOnly={readOnly}
+                    onQtyChange={(qtyPerBatch) => updateOutput(output.key, { qtyPerBatch })}
+                    onUomChange={(uomId) => updateOutput(output.key, { uomId })}
+                  />
+                </div>
+              ))}
+            </div>
+          </div>
+
+          {/* Custom fields */}
+          <div>
+            <div className="mb-2 flex items-center justify-between">
+              <p className="text-sm font-semibold text-foreground">Custom fields</p>
+              {!readOnly && (
+                <Button type="button" variant="ghost" size="sm" onClick={addField}>
+                  <Plus className="size-4" />
+                  Add
+                </Button>
+              )}
+            </div>
+            <div className="flex flex-col gap-2">
+              {data.fieldDefs.length === 0 && <p className="text-sm text-muted-foreground">No custom fields.</p>}
+              {data.fieldDefs.map((field) => (
+                <div key={field.localId} className="rounded-lg border border-border p-2.5">
+                  <div className="mb-2 flex items-center gap-2">
+                    <Input
+                      value={field.label}
+                      disabled={readOnly}
+                      onChange={(e) => updateField(field.localId, { label: e.target.value })}
+                      placeholder="Label"
+                      className="h-8 flex-1 text-sm"
+                    />
+                    {!readOnly && (
+                      <button type="button" onClick={() => removeField(field.localId)} className="shrink-0 text-muted-foreground hover:text-destructive" aria-label="Remove field">
+                        <Trash2 className="size-4" />
+                      </button>
+                    )}
+                  </div>
+                  {field.key && <p className="mb-2 font-mono text-xs text-muted-foreground">key: {field.key}</p>}
+                  <div className="flex items-center gap-2">
+                    <Select<CustomFieldType>
+                      value={field.type}
+                      onValueChange={(v) => v && updateField(field.localId, { type: v })}
+                    >
+                      <SelectTrigger className="h-8! flex-1 text-sm" disabled={readOnly}>
+                        <SelectValue />
+                      </SelectTrigger>
+                      <SelectContent>
+                        {FIELD_TYPES.map((t) => (
+                          <SelectItem key={t} value={t} className="text-sm">{t}</SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
+                    <div className="flex items-center gap-1.5">
+                      <Switch
+                        size="sm"
+                        checked={field.required}
+                        disabled={readOnly}
+                        onCheckedChange={(checked) => updateField(field.localId, { required: checked })}
+                      />
+                      <span className="text-xs text-muted-foreground">Required</span>
+                    </div>
+                  </div>
+                  {field.type === "Select" && (
+                    <Input
+                      value={field.options.join(", ")}
+                      disabled={readOnly}
+                      onChange={(e) => updateField(field.localId, { options: e.target.value.split(",").map((s) => s.trim()).filter(Boolean) })}
+                      placeholder="Options, comma separated"
+                      className="mt-2 h-8 text-sm"
+                    />
+                  )}
+                </div>
+              ))}
+            </div>
+          </div>
+
+          {!readOnly && (
+            <Button type="button" variant="outline" className={cn("mt-2 text-destructive hover:bg-destructive/10")} onClick={onDelete}>
+              <Trash2 className="size-4" />
+              Delete stage
+            </Button>
+          )}
+        </div>
+      </DialogContent>
+    </Dialog>
   )
 }
diff --git a/Frontend/erp-system/app/dashboard/production/templates/[id]/page.tsx b/Frontend/erp-system/app/dashboard/production/templates/[id]/page.tsx
index 8a19847..54f030d 100644
--- a/Frontend/erp-system/app/dashboard/production/templates/[id]/page.tsx
+++ b/Frontend/erp-system/app/dashboard/production/templates/[id]/page.tsx
@@ -20,7 +20,7 @@ import {
 } from "@xyflow/react"
 import "@xyflow/react/dist/style.css"
 import { useTheme } from "next-themes"
-import { AlertTriangle, ArrowLeft, Lock, Minus, Plus, Save, Square } from "lucide-react"
+import { AlertTriangle, Lock, Minus, Plus, Save, Square } from "lucide-react"
 
 import { cn } from "@/lib/utils"
 import { productionTemplatesApi } from "@/lib/api/production-templates"
@@ -643,9 +643,6 @@ export default function TemplateBuilderPage() {
     <div className="flex h-[calc(100vh-8rem)] flex-col gap-4">
       <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
         <div className="flex items-center gap-3">
-          <Link href="/dashboard/production/templates" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-            <ArrowLeft className="size-5" />
-          </Link>
           <div>
             <div className="flex items-center gap-3">
               <h1 className="text-2xl font-bold text-foreground">{name || "Untitled template"}</h1>
@@ -768,46 +765,44 @@ export default function TemplateBuilderPage() {
         </div>
       )}
 
-      <div className="flex min-h-0 flex-1 gap-4">
-        <div className="min-w-0 flex-1 overflow-hidden rounded-2xl bg-muted ring-1 ring-foreground/10">
-          {mounted && (
-            <ReactFlow
-              nodes={displayNodes}
-              edges={edges}
-              nodeTypes={nodeTypes}
-              onNodesChange={locked ? undefined : onNodesChange}
-              onEdgesChange={locked ? undefined : onEdgesChange}
-              onNodesDelete={locked ? undefined : onNodesDelete}
-              onConnect={locked ? undefined : onConnect}
-              onNodeClick={onNodeClick}
-              onPaneClick={onPaneClick}
-              nodesDraggable={!locked}
-              nodesConnectable={!locked}
-              elementsSelectable
-              colorMode={resolvedTheme === "dark" ? "dark" : "light"}
-              fitView
-            >
-              <Background />
-              <Controls showInteractive={!locked} />
-              <MiniMap pannable zoomable />
-            </ReactFlow>
-          )}
-        </div>
-
-        {selectedNode && (
-          <StageEditorPanel
-            data={selectedNode.data as StageNodeData}
-            isTerminal={analysis.terminalIds.has(selectedNode.id)}
-            upstreamOptions={upstreamOptions}
-            items={items}
-            uoms={uoms}
-            readOnly={locked}
-            onChange={(patch) => updateNodeData(selectedNode.id, patch)}
-            onDelete={() => deleteNode(selectedNode.id)}
-            onClose={() => setSelectedNodeId(null)}
-          />
+      <div className="min-h-0 flex-1 overflow-hidden rounded-2xl bg-muted ring-1 ring-foreground/10">
+        {mounted && (
+          <ReactFlow
+            nodes={displayNodes}
+            edges={edges}
+            nodeTypes={nodeTypes}
+            onNodesChange={locked ? undefined : onNodesChange}
+            onEdgesChange={locked ? undefined : onEdgesChange}
+            onNodesDelete={locked ? undefined : onNodesDelete}
+            onConnect={locked ? undefined : onConnect}
+            onNodeClick={onNodeClick}
+            onPaneClick={onPaneClick}
+            nodesDraggable={!locked}
+            nodesConnectable={!locked}
+            elementsSelectable
+            colorMode={resolvedTheme === "dark" ? "dark" : "light"}
+            fitView
+          >
+            <Background />
+            <Controls showInteractive={!locked} />
+            <MiniMap pannable zoomable />
+          </ReactFlow>
         )}
       </div>
+
+      {selectedNode && (
+        <StageEditorPanel
+          data={selectedNode.data as StageNodeData}
+          isTerminal={analysis.terminalIds.has(selectedNode.id)}
+          upstreamOptions={upstreamOptions}
+          items={items}
+          uoms={uoms}
+          readOnly={locked}
+          onChange={(patch) => updateNodeData(selectedNode.id, patch)}
+          onDelete={() => deleteNode(selectedNode.id)}
+          onClose={() => setSelectedNodeId(null)}
+        />
+      )}
     </div>
   )
 }
diff --git a/Frontend/erp-system/app/dashboard/products/[id]/page.tsx b/Frontend/erp-system/app/dashboard/products/[id]/page.tsx
index 9edce27..c426249 100644
--- a/Frontend/erp-system/app/dashboard/products/[id]/page.tsx
+++ b/Frontend/erp-system/app/dashboard/products/[id]/page.tsx
@@ -3,7 +3,7 @@
 import { useEffect, useState } from "react"
 import { useParams, useRouter } from "next/navigation"
 import Link from "next/link"
-import { AlertTriangle, ArrowLeft, Save } from "lucide-react"
+import { AlertTriangle, Save } from "lucide-react"
 
 import { itemsApi } from "@/lib/api/items"
 import { categoriesApi } from "@/lib/api/categories"
@@ -183,9 +183,6 @@ export default function ItemDetailPage() {
     <div className="flex flex-col gap-6">
       <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
         <div className="flex items-center gap-3">
-          <Link href="/dashboard/products" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-            <ArrowLeft className="size-5" />
-          </Link>
           <div>
             <div className="flex items-center gap-3">
               <h1 className="text-2xl font-bold text-foreground">{item.sku}</h1>
diff --git a/Frontend/erp-system/app/dashboard/products/categories/[id]/page.tsx b/Frontend/erp-system/app/dashboard/products/categories/[id]/page.tsx
index 0541ec0..b753a75 100644
--- a/Frontend/erp-system/app/dashboard/products/categories/[id]/page.tsx
+++ b/Frontend/erp-system/app/dashboard/products/categories/[id]/page.tsx
@@ -1,19 +1,17 @@
 "use client"
 
 import { useEffect, useState } from "react"
-import Link from "next/link"
 import { useParams } from "next/navigation"
-import { ArrowLeft, Ban, CheckCircle2, Network, Pencil, Plus } from "lucide-react"
+import { Ban, CheckCircle2, Network, Pencil, Plus } from "lucide-react"
 
 import { categoriesApi, subCategoriesApi } from "@/lib/api/categories"
 import { errorMessage } from "@/lib/error-map"
 import { validateCategoryName } from "@/lib/validations/master-data"
-import { cn } from "@/lib/utils"
 import { Category, SubCategory } from "@/types/master-data"
 
 import { AlertDialog, AlertDialogContent, AlertDialogTrigger } from "@/components/ui/alert-dialog"
 import { Badge } from "@/components/ui/badge"
-import { Button, buttonVariants } from "@/components/ui/button"
+import { Button } from "@/components/ui/button"
 import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog"
 import { Field, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field"
 import { Input } from "@/components/ui/input"
@@ -113,9 +111,6 @@ export default function CategorySubCategoriesPage() {
     <div className="flex flex-col gap-6">
       <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
         <div className="flex items-center gap-3">
-          <Link href="/dashboard/products/categories" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-            <ArrowLeft className="size-5" />
-          </Link>
           <div>
             <h1 className="text-2xl font-bold text-foreground">{category ? `${category.name} — Subcategories` : "Subcategories"}</h1>
             <p className="text-base text-muted-foreground">
@@ -171,13 +166,13 @@ export default function CategorySubCategoriesPage() {
 
       {!error && subCategories !== null && subCategories.length > 0 && (
         <Table className="text-base">
-          <TableHeader className="bg-indigo-50">
-            <TableRow className="hover:bg-indigo-50">
-              <TableHead className="h-12 px-3 text-sm text-indigo-700">ID</TableHead>
-              <TableHead className="h-12 px-3 text-sm text-indigo-700">Name</TableHead>
-              <TableHead className="h-12 px-3 text-sm text-indigo-700">Status</TableHead>
-              <TableHead className="h-12 px-3 text-sm text-indigo-700">Created At</TableHead>
-              <TableHead className="h-12 px-3 text-sm text-indigo-700">Actions</TableHead>
+          <TableHeader>
+            <TableRow>
+              <TableHead className="h-12 px-3 text-sm">ID</TableHead>
+              <TableHead className="h-12 px-3 text-sm">Name</TableHead>
+              <TableHead className="h-12 px-3 text-sm">Status</TableHead>
+              <TableHead className="h-12 px-3 text-sm">Created At</TableHead>
+              <TableHead className="h-12 px-3 text-sm">Actions</TableHead>
             </TableRow>
           </TableHeader>
           <TableBody>
diff --git a/Frontend/erp-system/app/dashboard/products/item-types/page.tsx b/Frontend/erp-system/app/dashboard/products/item-types/page.tsx
index 1381bcc..eac3119 100644
--- a/Frontend/erp-system/app/dashboard/products/item-types/page.tsx
+++ b/Frontend/erp-system/app/dashboard/products/item-types/page.tsx
@@ -1,18 +1,16 @@
 "use client"
 
 import { useEffect, useState } from "react"
-import Link from "next/link"
-import { ArrowLeft, Ban, CheckCircle2, Pencil, Plus, SwatchBook } from "lucide-react"
+import { Ban, CheckCircle2, Pencil, Plus, SwatchBook } from "lucide-react"
 
 import { itemTypesApi } from "@/lib/api/item-types"
 import { errorMessage } from "@/lib/error-map"
 import { validateItemTypeName } from "@/lib/validations/master-data"
-import { cn } from "@/lib/utils"
 import { ItemType } from "@/types/master-data"
 
 import { AlertDialog, AlertDialogContent, AlertDialogTrigger } from "@/components/ui/alert-dialog"
 import { Badge } from "@/components/ui/badge"
-import { Button, buttonVariants } from "@/components/ui/button"
+import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
 import { Field, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field"
 import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog"
@@ -110,9 +108,6 @@ export default function ItemTypesPage() {
     <div className="flex flex-col gap-6">
       <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
         <div className="flex items-center gap-3">
-          <Link href="/dashboard/products" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-            <ArrowLeft className="size-5" />
-          </Link>
           <div>
             <h1 className="text-2xl font-bold text-foreground">Item Types</h1>
             <p className="text-base text-muted-foreground">
@@ -174,13 +169,13 @@ export default function ItemTypesPage() {
 
       {!error && itemTypes !== null && itemTypes.length > 0 && (
         <Table className="text-base">
-          <TableHeader className="bg-indigo-50">
-            <TableRow className="hover:bg-indigo-50">
-              <TableHead className="h-12 px-3 text-sm text-indigo-700">ID</TableHead>
-              <TableHead className="h-12 px-3 text-sm text-indigo-700">Name</TableHead>
-              <TableHead className="h-12 px-3 text-sm text-indigo-700">Status</TableHead>
-              <TableHead className="h-12 px-3 text-sm text-indigo-700">Created At</TableHead>
-              <TableHead className="h-12 px-3 text-sm text-indigo-700">Actions</TableHead>
+          <TableHeader>
+            <TableRow>
+              <TableHead className="h-12 px-3 text-sm">ID</TableHead>
+              <TableHead className="h-12 px-3 text-sm">Name</TableHead>
+              <TableHead className="h-12 px-3 text-sm">Status</TableHead>
+              <TableHead className="h-12 px-3 text-sm">Created At</TableHead>
+              <TableHead className="h-12 px-3 text-sm">Actions</TableHead>
             </TableRow>
           </TableHeader>
           <TableBody>
diff --git a/Frontend/erp-system/app/dashboard/products/new/page.tsx b/Frontend/erp-system/app/dashboard/products/new/page.tsx
index 37ff5f3..fa24983 100644
--- a/Frontend/erp-system/app/dashboard/products/new/page.tsx
+++ b/Frontend/erp-system/app/dashboard/products/new/page.tsx
@@ -3,7 +3,7 @@
 import { useEffect, useMemo, useState } from "react"
 import { useRouter } from "next/navigation"
 import Link from "next/link"
-import { ArrowLeft, Plus, X } from "lucide-react"
+import { Plus, X } from "lucide-react"
 
 import { itemsApi } from "@/lib/api/items"
 import { categoriesApi } from "@/lib/api/categories"
@@ -254,9 +254,6 @@ export default function NewItemPage() {
   return (
     <div className="flex flex-col gap-6">
       <div className="flex items-center gap-3">
-        <Link href="/dashboard/products" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-          <ArrowLeft className="size-5" />
-        </Link>
         <div>
           <h1 className="text-2xl font-bold text-foreground">New Item</h1>
           <p className="text-base text-muted-foreground">Category, subcategory, brand, and item types (FR-MD-01).</p>
@@ -532,14 +529,14 @@ export default function NewItemPage() {
             {variants.length > 0 && (
               <div className="overflow-x-auto">
                 <Table className="text-base">
-                  <TableHeader className="bg-indigo-50">
-                    <TableRow className="hover:bg-indigo-50">
+                  <TableHeader>
+                    <TableRow>
                       {activeCategories.map((cat) => (
-                        <TableHead key={cat.itemTypeId} className="h-11 px-3 text-sm text-indigo-700">{cat.name}</TableHead>
+                        <TableHead key={cat.itemTypeId} className="h-11 px-3 text-sm">{cat.name}</TableHead>
                       ))}
-                      <TableHead className="h-11 px-3 text-sm text-indigo-700">SKU</TableHead>
+                      <TableHead className="h-11 px-3 text-sm">SKU</TableHead>
                       {priceMode === "fixed" && (
-                        <TableHead className="h-11 px-3 text-sm text-indigo-700">Sale price</TableHead>
+                        <TableHead className="h-11 px-3 text-sm">Sale price</TableHead>
                       )}
                       {/* Quantity column removed 2026-07-17: there is no `initialQty` on the
                           Item contract and no initial-receipt flow — stock arrives via a GRN.
diff --git a/Frontend/erp-system/app/dashboard/products/settings/page.tsx b/Frontend/erp-system/app/dashboard/products/settings/page.tsx
index ba369e9..01c5d80 100644
--- a/Frontend/erp-system/app/dashboard/products/settings/page.tsx
+++ b/Frontend/erp-system/app/dashboard/products/settings/page.tsx
@@ -1,15 +1,12 @@
 "use client"
 
 import { useEffect, useState } from "react"
-import Link from "next/link"
-import { ArrowLeft, Package } from "lucide-react"
+import { Package } from "lucide-react"
 
 import { productConfigApi } from "@/lib/api/product-config"
 import { errorMessage } from "@/lib/error-map"
-import { cn } from "@/lib/utils"
 import { ProductConfig } from "@/types/master-data"
 
-import { buttonVariants } from "@/components/ui/button"
 import { Skeleton } from "@/components/ui/skeleton"
 import { Switch } from "@/components/ui/switch"
 import { toast } from "@/components/ui/toast"
@@ -70,9 +67,6 @@ export default function ProductSettingsPage() {
   return (
     <div className="flex flex-col gap-6">
       <div className="flex items-center gap-3">
-        <Link href="/dashboard/products" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-          <ArrowLeft className="size-5" />
-        </Link>
         <div>
           <h1 className="text-2xl font-bold text-foreground">Product Configuration</h1>
           <p className="text-base text-muted-foreground">
diff --git a/Frontend/erp-system/app/dashboard/products/uoms/page.tsx b/Frontend/erp-system/app/dashboard/products/uoms/page.tsx
index 960cb72..8ce3c1e 100644
--- a/Frontend/erp-system/app/dashboard/products/uoms/page.tsx
+++ b/Frontend/erp-system/app/dashboard/products/uoms/page.tsx
@@ -1,16 +1,14 @@
 "use client"
 
 import { useEffect, useState } from "react"
-import Link from "next/link"
-import { ArrowLeft, Plus, Ruler } from "lucide-react"
+import { Plus, Ruler } from "lucide-react"
 
 import { uomsApi } from "@/lib/api/uoms"
 import { errorMessage, fieldErrors } from "@/lib/error-map"
 import { validateUomName } from "@/lib/validations/master-data"
-import { cn } from "@/lib/utils"
 import { Uom } from "@/types/master-data"
 
-import { Button, buttonVariants } from "@/components/ui/button"
+import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
 import { Field, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field"
 import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog"
@@ -59,9 +57,6 @@ export default function UomsPage() {
     <div className="flex flex-col gap-6">
       <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
         <div className="flex items-center gap-3">
-          <Link href="/dashboard/products" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-            <ArrowLeft className="size-5" />
-          </Link>
           <div>
             <h1 className="text-2xl font-bold text-foreground">Units of Measure</h1>
             <p className="text-base text-muted-foreground">Flat UOM master, used as item base UOMs and in per-item conversions (FR-MD-02).</p>
diff --git a/Frontend/erp-system/app/dashboard/receiving/grn/[id]/page.tsx b/Frontend/erp-system/app/dashboard/receiving/grn/[id]/page.tsx
index 26d1b7d..4d66b46 100644
--- a/Frontend/erp-system/app/dashboard/receiving/grn/[id]/page.tsx
+++ b/Frontend/erp-system/app/dashboard/receiving/grn/[id]/page.tsx
@@ -3,7 +3,7 @@
 import { useEffect, useRef, useState } from "react"
 import { useParams } from "next/navigation"
 import Link from "next/link"
-import { ArrowLeft, CheckCircle2, PackageCheck, PackageX, ShieldAlert, XCircle } from "lucide-react"
+import { CheckCircle2, PackageCheck, PackageX, ShieldAlert, XCircle } from "lucide-react"
 
 import { grnsApi } from "@/lib/api/grns"
 import { warehousesApi } from "@/lib/api/warehouses"
@@ -118,9 +118,6 @@ export default function GrnDetailPage() {
     <div className="flex flex-col gap-6">
       <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
         <div className="flex items-center gap-3">
-          <Link href="/dashboard/receiving/grn" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-            <ArrowLeft className="size-5" />
-          </Link>
           <div>
             <div className="flex items-center gap-3">
               <h1 className="text-2xl font-bold text-foreground">{grn.docNo}</h1>
diff --git a/Frontend/erp-system/app/dashboard/receiving/grn/new/page.tsx b/Frontend/erp-system/app/dashboard/receiving/grn/new/page.tsx
index 292283b..f0a3d71 100644
--- a/Frontend/erp-system/app/dashboard/receiving/grn/new/page.tsx
+++ b/Frontend/erp-system/app/dashboard/receiving/grn/new/page.tsx
@@ -3,7 +3,7 @@
 import { useEffect, useState } from "react"
 import { useRouter } from "next/navigation"
 import Link from "next/link"
-import { ArrowLeft, ExternalLink, Plus, RefreshCw, Trash2 } from "lucide-react"
+import { ExternalLink, Plus, RefreshCw, Trash2 } from "lucide-react"
 
 import { grnsApi } from "@/lib/api/grns"
 import { purchaseOrdersApi } from "@/lib/api/purchase-orders"
@@ -303,9 +303,6 @@ export default function NewGrnPage() {
   return (
     <div className="flex flex-col gap-6">
       <div className="flex items-center gap-3">
-        <Link href="/dashboard/receiving/grn" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-          <ArrowLeft className="size-5" />
-        </Link>
         <div>
           <h1 className="text-2xl font-bold text-foreground">New GRN</h1>
           <p className="text-base text-muted-foreground">Receive goods against a purchase order, or record a direct receipt (FR-GRN-01/02).</p>
@@ -446,7 +443,7 @@ export default function NewGrnPage() {
               <Table className="text-base">
                 <TableHeader>
                   <TableRow>
-                    <TableHead className="h-12 w-56 px-3 text-sm">Item</TableHead>
+                    <TableHead className="h-12 w-96 px-3 text-sm">Item</TableHead>
                     <TableHead className="h-12 w-24 px-3 text-sm">UOM</TableHead>
                     <TableHead className="h-12 w-28 px-3 text-sm">Bin</TableHead>
                     <TableHead className="h-12 w-20 px-3 text-sm">Qty</TableHead>
@@ -454,7 +451,7 @@ export default function NewGrnPage() {
                     <TableHead className="h-12 w-24 px-3 text-sm">Disc %</TableHead>
                     <TableHead className="h-12 w-24 px-3 text-sm">VAT %</TableHead>
                     <TableHead className="h-12 w-28 px-3 text-sm text-right">Line total</TableHead>
-                    <TableHead className="h-12 w-32 px-3 text-sm">Hold status</TableHead>
+                    <TableHead className="h-12 w-56 px-3 text-sm">Hold status</TableHead>
                     <TableHead className="h-12 w-44 px-3 text-sm">Batch / Serial</TableHead>
                     <TableHead className="h-12 w-10 px-3" />
                   </TableRow>
diff --git a/Frontend/erp-system/app/dashboard/sales/bundles/[id]/page.tsx b/Frontend/erp-system/app/dashboard/sales/bundles/[id]/page.tsx
new file mode 100644
index 0000000..3efe88f
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/sales/bundles/[id]/page.tsx
@@ -0,0 +1,355 @@
+"use client"
+
+import { useEffect, useMemo, useState } from "react"
+import Link from "next/link"
+import { useParams, useRouter } from "next/navigation"
+import { ArrowLeft, CheckCircle2, Edit, Minus, Plus, Printer, Save, XCircle } from "lucide-react"
+
+import { bundleApi } from "@/lib/api/bundles"
+import { itemsApi } from "@/lib/api/items"
+import { uomsApi } from "@/lib/api/uoms"
+import { errorMessage } from "@/lib/error-map"
+import { Button, buttonVariants } from "@/components/ui/button"
+import { Badge } from "@/components/ui/badge"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+import { cn } from "@/lib/utils"
+import { BundleSale, BundleSaleTemplateSummary, BundleSaleTemplateLine, UpdateBundleSaleRequest } from "@/types/bundles"
+import { customersApi } from "@/lib/api/customers"
+import { warehousesApi } from "@/lib/api/warehouses"
+import { usersApi } from "@/lib/api/users"
+import { Customer } from "@/types/customers"
+import { ItemListItem, Uom, Warehouse } from "@/types/master-data"
+import { ManagedUser } from "@/types/users"
+
+type EditableLine = BundleSaleTemplateLine & { key: string }
+
+function statusClass(status: BundleSale["status"]) {
+  switch (status) {
+    case "Draft":
+      return "border-amber-200 bg-amber-50 text-amber-800"
+    case "Posted":
+      return "border-emerald-200 bg-emerald-50 text-emerald-800"
+    case "Cancelled":
+      return "border-rose-200 bg-rose-50 text-rose-800"
+  }
+}
+
+export default function BundleSaleDetailPage() {
+  const router = useRouter()
+  const params = useParams<{ id: string }>()
+  const bundleSaleId = Number(params.id)
+  const [bundle, setBundle] = useState<BundleSale | null>(null)
+  const [editing, setEditing] = useState(false)
+  const [templates, setTemplates] = useState<BundleSaleTemplateSummary[]>([])
+  const [customers, setCustomers] = useState<Customer[]>([])
+  const [items, setItems] = useState<ItemListItem[]>([])
+  const [uoms, setUoms] = useState<Uom[]>([])
+  const [warehouses, setWarehouses] = useState<Warehouse[]>([])
+  const [users, setUsers] = useState<ManagedUser[]>([])
+  const [customerId, setCustomerId] = useState<number | null>(null)
+  const [warehouseId, setWarehouseId] = useState<number | null>(null)
+  const [cashierUserId, setCashierUserId] = useState<number | null>(null)
+  const [templateId, setTemplateId] = useState<number | null>(null)
+  const [bundleName, setBundleName] = useState("")
+  const [bundlePrice, setBundlePrice] = useState(0)
+  const [allowPriceOverride, setAllowPriceOverride] = useState(false)
+  const [lines, setLines] = useState<EditableLine[]>([])
+  const [error, setError] = useState<string | null>(null)
+  const [busy, setBusy] = useState(false)
+
+  useEffect(() => {
+    if (!Number.isFinite(bundleSaleId)) {
+      setError(`Invalid bundle id '${params.id}'.`)
+      return
+    }
+    Promise.all([
+      bundleApi.getBundle(bundleSaleId),
+      bundleApi.listTemplates({ pageSize: 200 }),
+      customersApi.list({ pageSize: 200 }),
+      itemsApi.list({ pageSize: 200 }),
+      uomsApi.list({ pageSize: 200 }),
+      warehousesApi.list({ pageSize: 200 }),
+      usersApi.list({ pageSize: 200 }),
+    ])
+      .then(([bundleRes, templateRes, custRes, itemRes, uomRes, whRes, userRes]) => {
+        const data = bundleRes
+        setBundle(data)
+        setTemplates(templateRes.items)
+        setCustomers(custRes.items)
+        setItems(itemRes.items)
+        setUoms(uomRes.items)
+        setWarehouses(whRes.items)
+        setUsers(userRes.items)
+        setCustomerId(data.customerId)
+        setWarehouseId(data.warehouseId)
+        setCashierUserId(data.cashierUserId)
+        setTemplateId(data.bundleSaleTemplateId)
+        setBundleName(data.bundleName)
+        setBundlePrice(data.bundlePrice)
+        setLines(
+          data.lines.map((line) => ({
+            key: `${line.bundleSaleLineId}`,
+            bundleSaleTemplateLineId: line.bundleSaleLineId,
+            itemId: line.itemId,
+            uomId: line.uomId,
+            warehouseId: line.warehouseId,
+            qty: line.qty,
+            unitPrice: line.unitPrice,
+            includeInBundle: line.includeInBundle,
+            sortOrder: line.bundleSaleLineId,
+          }))
+        )
+      })
+      .catch((err) => setError(errorMessage(err)))
+  }, [bundleSaleId, params.id])
+
+  const templateLabel = useMemo(() => templates.find((t) => t.bundleSaleTemplateId === templateId)?.templateName ?? "Template", [templates, templateId])
+  const componentSubtotal = useMemo(() => lines.reduce((sum, line) => sum + Number(line.qty || 0) * Number(line.unitPrice || 0), 0), [lines])
+  const isDraft = bundle?.status === "Draft"
+  const canEdit = isDraft
+
+  function updateLine(key: string, patch: Partial<EditableLine>) {
+    setLines((prev) => prev.map((line) => (line.key === key ? { ...line, ...patch } : line)))
+  }
+
+  function addLine() {
+    const source = lines[lines.length - 1]
+    if (!source) return
+    setLines((prev) => [...prev, { ...source, key: crypto.randomUUID() }])
+  }
+
+  function removeLine(key: string) {
+    setLines((prev) => (prev.length === 1 ? prev : prev.filter((line) => line.key !== key)))
+  }
+
+  async function saveBundle() {
+    if (!bundle || !customerId || !warehouseId || !cashierUserId || !templateId) return
+    setBusy(true)
+    setError(null)
+    try {
+      const request: UpdateBundleSaleRequest = {
+        customerId,
+        warehouseId,
+        cashierUserId,
+        bundleSaleTemplateId: templateId,
+        bundleName,
+        bundlePrice,
+        allowPriceOverride,
+        lines: lines.map(({ key, ...line }) => line),
+      }
+      const res = await bundleApi.updateBundle(bundle.bundleSaleId, request)
+      setBundle(res)
+      setEditing(false)
+      router.refresh()
+    } catch (err) {
+      setError(errorMessage(err))
+    } finally {
+      setBusy(false)
+    }
+  }
+
+  async function postBundle() {
+    if (!bundle) return
+    setBusy(true)
+    setError(null)
+    try {
+      const check = await bundleApi.checkBundlePosting(bundle.bundleSaleId)
+      if (!check.canPost) {
+        setError("Resolve stock shortages before posting this bundle.")
+        return
+      }
+      const updated = await bundleApi.postBundle(bundle.bundleSaleId)
+      setBundle({ ...bundle, ...updated })
+    } catch (err) {
+      setError(errorMessage(err))
+    } finally {
+      setBusy(false)
+    }
+  }
+
+  async function cancelBundle() {
+    if (!bundle) return
+    setBusy(true)
+    setError(null)
+    try {
+      const updated = await bundleApi.cancelBundle(bundle.bundleSaleId)
+      setBundle({ ...bundle, ...updated })
+    } catch (err) {
+      setError(errorMessage(err))
+    } finally {
+      setBusy(false)
+    }
+  }
+
+  if (error && !bundle) return <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>
+  if (!bundle) return <div className="rounded-2xl border border-dashed p-8 text-muted-foreground">Loading bundle sale...</div>
+
+  const printHref = `/print/sales/bundles/${bundle.bundleSaleId}`
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+        <div className="flex items-center gap-3">
+          <Link href="/dashboard/sales/bundles" className={cn(buttonVariants({ variant: "outline", size: "icon" }))}>
+            <ArrowLeft className="size-4" />
+          </Link>
+          <div>
+            <h1 className="text-2xl font-bold text-foreground">{bundle.bundleNo}</h1>
+            <p className="text-base text-muted-foreground">{bundle.bundleName}</p>
+          </div>
+        </div>
+        <div className="flex flex-wrap gap-2">
+          <Link href={printHref} target="_blank" rel="noopener noreferrer" className={cn(buttonVariants({ variant: "outline", size: "lg" }))}>
+            <Printer className="size-4" />
+            Print
+          </Link>
+          {canEdit ? (
+            editing ? (
+              <Button variant="outline" size="lg" onClick={saveBundle} disabled={busy}>
+                <Save className="size-4" />
+                Save
+              </Button>
+            ) : (
+              <Button variant="outline" size="lg" onClick={() => setEditing(true)} disabled={!isDraft}>
+                <Edit className="size-4" />
+                Edit
+              </Button>
+            )
+          ) : null}
+          {isDraft ? (
+            <>
+              <Button variant="outline" size="lg" onClick={postBundle} disabled={busy}>
+                <CheckCircle2 className="size-4" />
+                Post
+              </Button>
+              <Button variant="outline" size="lg" onClick={cancelBundle} disabled={busy}>
+                <XCircle className="size-4" />
+                Cancel
+              </Button>
+            </>
+          ) : null}
+        </div>
+      </div>
+
+      {error ? <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div> : null}
+
+      <section className="rounded-2xl border bg-card p-4 shadow-sm">
+        <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
+          <div className="space-y-1.5">
+            <Label>Customer</Label>
+            <Select value={customerId ? String(customerId) : "all"} onValueChange={(v) => setCustomerId(v === "all" ? null : Number(v))} disabled={!editing || !isDraft}>
+              <SelectTrigger><SelectValue placeholder="Customer" /></SelectTrigger>
+              <SelectContent>{customers.map((c) => <SelectItem key={c.customerId} value={String(c.customerId)}>{c.customerCode} - {c.displayName ?? c.name}</SelectItem>)}</SelectContent>
+            </Select>
+          </div>
+          <div className="space-y-1.5">
+            <Label>Warehouse</Label>
+            <Select value={warehouseId ? String(warehouseId) : "all"} onValueChange={(v) => setWarehouseId(v === "all" ? null : Number(v))} disabled={!editing || !isDraft}>
+              <SelectTrigger><SelectValue placeholder="Warehouse" /></SelectTrigger>
+              <SelectContent>{warehouses.map((w) => <SelectItem key={w.warehouseId} value={String(w.warehouseId)}>{w.code} - {w.name}</SelectItem>)}</SelectContent>
+            </Select>
+          </div>
+          <div className="space-y-1.5">
+            <Label>Cashier</Label>
+            <Select value={cashierUserId ? String(cashierUserId) : "all"} onValueChange={(v) => setCashierUserId(v === "all" ? null : Number(v))} disabled={!editing || !isDraft}>
+              <SelectTrigger><SelectValue placeholder="Cashier" /></SelectTrigger>
+              <SelectContent>{users.map((u) => <SelectItem key={u.userId} value={String(u.userId)}>{u.displayName}</SelectItem>)}</SelectContent>
+            </Select>
+          </div>
+          <div className="space-y-1.5">
+            <Label>Template</Label>
+            <Select value={templateId ? String(templateId) : "all"} onValueChange={(v) => setTemplateId(v === "all" ? null : Number(v))} disabled={!editing || !isDraft}>
+              <SelectTrigger><SelectValue placeholder={templateLabel} /></SelectTrigger>
+              <SelectContent>{templates.map((t) => <SelectItem key={t.bundleSaleTemplateId} value={String(t.bundleSaleTemplateId)}>{t.templateCode} - {t.templateName}</SelectItem>)}</SelectContent>
+            </Select>
+          </div>
+          <div className="space-y-1.5">
+            <Label>Bundle name</Label>
+            <Input value={bundleName} onChange={(e) => setBundleName(e.target.value)} disabled={!editing || !isDraft} />
+          </div>
+          <div className="space-y-1.5">
+            <Label>Bundle price</Label>
+            <Input type="number" min="0" step="0.01" value={bundlePrice} onChange={(e) => setBundlePrice(Number(e.target.value))} disabled={!editing || !isDraft} />
+          </div>
+        </div>
+      </section>
+
+      <section className="rounded-2xl border bg-card shadow-sm">
+        <div className="flex items-center justify-between border-b px-4 py-3">
+          <div>
+            <h2 className="text-sm font-semibold">Component breakdown</h2>
+            <p className="text-xs text-muted-foreground">{editing ? "Edit the component lines and save." : "Read-only until you enter edit mode."}</p>
+          </div>
+          {editing && isDraft ? <Button type="button" variant="outline" size="sm" onClick={addLine}><Plus className="size-4" /> Add line</Button> : <Badge variant="outline" className={statusClass(bundle.status)}>{bundle.status}</Badge>}
+        </div>
+        <div className="overflow-x-auto">
+          <Table>
+            <TableHeader>
+                <TableRow>
+                  <TableHead>Item</TableHead>
+                  <TableHead>UOM</TableHead>
+                  <TableHead className="text-right">Qty</TableHead>
+                  <TableHead className="text-right">Unit price</TableHead>
+                  <TableHead className="text-right">Include</TableHead>
+                  {editing && isDraft ? <TableHead /> : null}
+                </TableRow>
+              </TableHeader>
+              <TableBody>
+                {lines.map((line) => (
+                  <TableRow key={line.key}>
+                    <TableCell className="min-w-72">
+                      <Select value={line.itemId ? String(line.itemId) : "all"} onValueChange={(v) => {
+                        const itemId = Number(v)
+                        const item = items.find((candidate) => candidate.itemId === itemId)
+                        updateLine(line.key, { itemId, unitPrice: item?.salePrice ?? line.unitPrice })
+                      }} disabled={!editing || !isDraft}>
+                        <SelectTrigger className="h-9 text-sm">
+                          <SelectValue placeholder="Select item" />
+                        </SelectTrigger>
+                        <SelectContent>
+                          {items.map((item) => (
+                            <SelectItem key={item.itemId} value={String(item.itemId)}>
+                              {item.sku} - {item.name}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
+                    </TableCell>
+                    <TableCell className="min-w-40">
+                      <Select value={line.uomId ? String(line.uomId) : "all"} onValueChange={(v) => updateLine(line.key, { uomId: v === "all" ? 0 : Number(v) })} disabled={!editing || !isDraft}>
+                        <SelectTrigger className="h-9 text-sm">
+                          <SelectValue placeholder="Select UOM" />
+                        </SelectTrigger>
+                        <SelectContent>
+                          {uoms.map((uom) => (
+                            <SelectItem key={uom.uomId} value={String(uom.uomId)}>
+                              {uom.name}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
+                    </TableCell>
+                    <TableCell className="text-right w-28"><Input type="number" min="0" step="0.01" value={line.qty} onChange={(e) => updateLine(line.key, { qty: Number(e.target.value) })} disabled={!editing || !isDraft} className="text-right" /></TableCell>
+                    <TableCell className="text-right w-32"><Input type="number" min="0" step="0.01" value={line.unitPrice} onChange={(e) => updateLine(line.key, { unitPrice: Number(e.target.value) })} disabled={!editing || !isDraft} className="text-right" /></TableCell>
+                    <TableCell className="text-right">{line.includeInBundle ? "Yes" : "No"}</TableCell>
+                    {editing && isDraft ? <TableCell className="text-right"><Button type="button" variant="ghost" size="icon-sm" onClick={() => removeLine(line.key)} disabled={lines.length === 1}><Minus className="size-4" /></Button></TableCell> : null}
+                  </TableRow>
+                ))}
+            </TableBody>
+          </Table>
+        </div>
+      </section>
+
+      <section className="rounded-2xl border bg-card p-4 shadow-sm">
+        <div className="grid gap-3 md:grid-cols-3">
+          <div><div className="text-xs text-muted-foreground">Component subtotal</div><div className="text-lg font-semibold">{componentSubtotal.toFixed(2)}</div></div>
+          <div><div className="text-xs text-muted-foreground">Bundle price</div><div className="text-lg font-semibold">{bundlePrice.toFixed(2)}</div></div>
+          <div><div className="text-xs text-muted-foreground">Margin</div><div className="text-lg font-semibold">{(bundlePrice - componentSubtotal).toFixed(2)}</div></div>
+        </div>
+      </section>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/sales/bundles/new/page.tsx b/Frontend/erp-system/app/dashboard/sales/bundles/new/page.tsx
new file mode 100644
index 0000000..42337bf
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/sales/bundles/new/page.tsx
@@ -0,0 +1,288 @@
+"use client"
+
+import { useEffect, useMemo, useState } from "react"
+import { useRouter, useSearchParams } from "next/navigation"
+import Link from "next/link"
+import { ArrowLeft, Minus, Plus, Save } from "lucide-react"
+
+import { bundleApi } from "@/lib/api/bundles"
+import { customersApi } from "@/lib/api/customers"
+import { itemsApi } from "@/lib/api/items"
+import { uomsApi } from "@/lib/api/uoms"
+import { warehousesApi } from "@/lib/api/warehouses"
+import { usersApi } from "@/lib/api/users"
+import { errorMessage } from "@/lib/error-map"
+import { Button, buttonVariants } from "@/components/ui/button"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+import { cn } from "@/lib/utils"
+import { toast } from "@/components/ui/toast"
+import { Customer } from "@/types/customers"
+import { ItemListItem, Uom, Warehouse } from "@/types/master-data"
+import { ManagedUser } from "@/types/users"
+import { BundleSaleTemplate, BundleSaleTemplateLine, BundleSaleTemplateSummary, CreateBundleSaleRequest } from "@/types/bundles"
+
+type EditableLine = BundleSaleTemplateLine & { key: string }
+
+const blankLine = (source: BundleSaleTemplateLine): EditableLine => ({ ...source, key: crypto.randomUUID() })
+
+export default function NewBundleSalePage() {
+  const router = useRouter()
+  const searchParams = useSearchParams()
+  const templateFromQuery = searchParams.get("templateId")
+  const [customers, setCustomers] = useState<Customer[]>([])
+  const [items, setItems] = useState<ItemListItem[]>([])
+  const [uoms, setUoms] = useState<Uom[]>([])
+  const [warehouses, setWarehouses] = useState<Warehouse[]>([])
+  const [users, setUsers] = useState<ManagedUser[]>([])
+  const [templates, setTemplates] = useState<BundleSaleTemplateSummary[]>([])
+  const [template, setTemplate] = useState<BundleSaleTemplate | null>(null)
+  const [customerId, setCustomerId] = useState<number | null>(null)
+  const [warehouseId, setWarehouseId] = useState<number | null>(null)
+  const [cashierUserId, setCashierUserId] = useState<number | null>(null)
+  const [templateId, setTemplateId] = useState<number | null>(templateFromQuery ? Number(templateFromQuery) : null)
+  const [bundleName, setBundleName] = useState("Demo Bundle")
+  const [bundlePrice, setBundlePrice] = useState<number>(0)
+  const [allowPriceOverride, setAllowPriceOverride] = useState(false)
+  const [lines, setLines] = useState<EditableLine[]>([])
+  const [loading, setLoading] = useState(true)
+  const [saving, setSaving] = useState(false)
+  const [submitError, setSubmitError] = useState<string | null>(null)
+
+  useEffect(() => {
+    Promise.all([
+      customersApi.list({ pageSize: 200 }),
+      itemsApi.list({ pageSize: 200 }),
+      uomsApi.list({ pageSize: 200 }),
+      warehousesApi.list({ pageSize: 200 }),
+      usersApi.list({ pageSize: 200 }),
+      bundleApi.listTemplates({ pageSize: 200 }),
+    ])
+      .then(([cust, itemRes, uomRes, whRes, userRes, templateRes]) => {
+        setCustomers(cust.items)
+        setItems(itemRes.items)
+        setUoms(uomRes.items)
+        setWarehouses(whRes.items)
+        setUsers(userRes.items)
+        setTemplates(templateRes.items)
+        setCustomerId(cust.items[0]?.customerId ?? null)
+        setWarehouseId(whRes.items[0]?.warehouseId ?? null)
+        setCashierUserId(userRes.items[0]?.userId ?? null)
+        setTemplateId((current) => current ?? templateRes.items[0]?.bundleSaleTemplateId ?? null)
+      })
+      .catch((err) => setSubmitError(errorMessage(err)))
+      .finally(() => setLoading(false))
+  }, [])
+
+  useEffect(() => {
+    if (!templateId) return
+    bundleApi.getTemplate(templateId).then((res) => {
+      setTemplate(res)
+      setLines(res.lines.map(blankLine))
+      setBundlePrice(res.lines.reduce((sum, line) => sum + line.qty * line.unitPrice, 0))
+    }).catch((err) => setSubmitError(errorMessage(err)))
+  }, [templateId])
+
+  const templateLabel = useMemo(() => template?.templateName ?? "Select template", [template])
+  const componentSubtotal = useMemo(() => lines.reduce((sum, line) => sum + Number(line.qty || 0) * Number(line.unitPrice || 0), 0), [lines])
+
+  function updateLine(key: string, patch: Partial<EditableLine>) {
+    setLines((prev) => prev.map((line) => (line.key === key ? { ...line, ...patch } : line)))
+  }
+
+  function addLine() {
+    const source = lines[lines.length - 1] ?? template?.lines[0]
+    if (!source) return
+    setLines((prev) => [...prev, blankLine(source)])
+  }
+
+  function removeLine(key: string) {
+    setLines((prev) => (prev.length === 1 ? prev : prev.filter((line) => line.key !== key)))
+  }
+
+  async function submit() {
+    if (!customerId || !warehouseId || !cashierUserId || !templateId || !template) {
+      setSubmitError("Select customer, warehouse, cashier, and bundle template.")
+      return
+    }
+    if (lines.length === 0) {
+      setSubmitError("Add at least one bundle component line.")
+      return
+    }
+    setSaving(true)
+    setSubmitError(null)
+    try {
+      const request: CreateBundleSaleRequest = {
+        customerId,
+        warehouseId,
+        cashierUserId,
+        bundleSaleTemplateId: templateId,
+        bundleName,
+        bundlePrice,
+        allowPriceOverride,
+        lines: lines.map(({ key, ...line }) => line),
+      }
+      const res = await bundleApi.createBundle(request)
+      toast.success("Bundle saved", res.bundleNo)
+      router.push(`/dashboard/sales/bundles/${res.bundleSaleId}`)
+    } catch (err) {
+      setSubmitError(errorMessage(err))
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  if (loading) return <div className="rounded-2xl border border-dashed p-8 text-muted-foreground">Loading masters...</div>
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex items-center gap-3">
+        <Link href="/dashboard/sales/bundles" className={cn(buttonVariants({ variant: "outline", size: "icon" }))}>
+          <ArrowLeft className="size-4" />
+        </Link>
+        <div>
+          <h1 className="text-2xl font-bold text-foreground">Create bundle sale</h1>
+          <p className="text-base text-muted-foreground">Create a fixed bundle from a stored template.</p>
+        </div>
+      </div>
+
+      {submitError ? <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{submitError}</div> : null}
+
+      <section className="rounded-2xl border bg-card p-4 shadow-sm">
+        <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
+          <div className="space-y-1.5">
+            <Label>Customer</Label>
+            <Select value={customerId ? String(customerId) : "all"} onValueChange={(v) => setCustomerId(v === "all" ? null : Number(v))}>
+              <SelectTrigger><SelectValue placeholder="Select customer" /></SelectTrigger>
+              <SelectContent>{customers.map((c) => <SelectItem key={c.customerId} value={String(c.customerId)}>{c.customerCode} - {c.displayName ?? c.name}</SelectItem>)}</SelectContent>
+            </Select>
+          </div>
+          <div className="space-y-1.5">
+            <Label>Warehouse</Label>
+            <Select value={warehouseId ? String(warehouseId) : "all"} onValueChange={(v) => setWarehouseId(v === "all" ? null : Number(v))}>
+              <SelectTrigger><SelectValue placeholder="Select warehouse" /></SelectTrigger>
+              <SelectContent>{warehouses.map((w) => <SelectItem key={w.warehouseId} value={String(w.warehouseId)}>{w.code} - {w.name}</SelectItem>)}</SelectContent>
+            </Select>
+          </div>
+          <div className="space-y-1.5">
+            <Label>Cashier</Label>
+            <Select value={cashierUserId ? String(cashierUserId) : "all"} onValueChange={(v) => setCashierUserId(v === "all" ? null : Number(v))}>
+              <SelectTrigger><SelectValue placeholder="Select cashier" /></SelectTrigger>
+              <SelectContent>{users.map((u) => <SelectItem key={u.userId} value={String(u.userId)}>{u.displayName}</SelectItem>)}</SelectContent>
+            </Select>
+          </div>
+          <div className="space-y-1.5">
+            <Label>Template</Label>
+            <Select value={templateId ? String(templateId) : "all"} onValueChange={(v) => setTemplateId(v === "all" ? null : Number(v))}>
+              <SelectTrigger><SelectValue placeholder={templateLabel} /></SelectTrigger>
+              <SelectContent>{templates.map((t) => <SelectItem key={t.bundleSaleTemplateId} value={String(t.bundleSaleTemplateId)}>{t.templateCode} - {t.templateName}</SelectItem>)}</SelectContent>
+            </Select>
+          </div>
+          <div className="space-y-1.5">
+            <Label>Bundle name</Label>
+            <Input value={bundleName} onChange={(e) => setBundleName(e.target.value)} />
+          </div>
+          <div className="space-y-1.5">
+            <Label>Bundle price</Label>
+            <Input type="number" min="0" step="0.01" value={bundlePrice} onChange={(e) => setBundlePrice(Number(e.target.value))} />
+          </div>
+          <div className="space-y-1.5">
+            <Label>Override allowed</Label>
+            <button type="button" onClick={() => setAllowPriceOverride((v) => !v)} className={cn("flex h-10 w-full items-center justify-center rounded-md border px-3 text-sm font-medium", allowPriceOverride ? "border-emerald-200 bg-emerald-50 text-emerald-800" : "border-border text-muted-foreground")}>
+              {allowPriceOverride ? "Yes" : "No"}
+            </button>
+          </div>
+        </div>
+      </section>
+
+      <section className="rounded-2xl border bg-card shadow-sm">
+        <div className="flex items-center justify-between border-b px-4 py-3">
+          <div>
+            <h2 className="text-sm font-semibold">Editable component rows</h2>
+            <p className="text-xs text-muted-foreground">These rows are sent to the backend and stored with the bundle.</p>
+          </div>
+          <Button type="button" variant="outline" size="sm" onClick={addLine}><Plus className="size-4" /> Add component</Button>
+        </div>
+        <div className="overflow-x-auto">
+            <Table>
+            <TableHeader>
+              <TableRow>
+                <TableHead>Item</TableHead>
+                <TableHead>UOM</TableHead>
+                <TableHead className="text-right">Qty</TableHead>
+                <TableHead className="text-right">Unit price</TableHead>
+                <TableHead className="text-right">Include</TableHead>
+                <TableHead />
+              </TableRow>
+            </TableHeader>
+            <TableBody>
+              {lines.map((line) => (
+                <TableRow key={line.key}>
+                  <TableCell className="min-w-72">
+                      <Select value={line.itemId ? String(line.itemId) : "all"} onValueChange={(v) => {
+                        const itemId = Number(v)
+                      const item = items.find((candidate) => candidate.itemId === itemId)
+                      updateLine(line.key, {
+                        itemId,
+                        unitPrice: item?.salePrice ?? line.unitPrice,
+                      })
+                    }}>
+                      <SelectTrigger className="h-9 text-sm">
+                        <SelectValue placeholder="Select item" />
+                      </SelectTrigger>
+                      <SelectContent>
+                        {items.map((item) => (
+                          <SelectItem key={item.itemId} value={String(item.itemId)}>
+                            {item.sku} - {item.name}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
+                  </TableCell>
+                  <TableCell className="min-w-40">
+                      <Select value={line.uomId ? String(line.uomId) : "all"} onValueChange={(v) => updateLine(line.key, { uomId: v === "all" ? 0 : Number(v) })}>
+                      <SelectTrigger className="h-9 text-sm">
+                        <SelectValue placeholder="Select UOM" />
+                      </SelectTrigger>
+                      <SelectContent>
+                        {uoms.map((uom) => (
+                          <SelectItem key={uom.uomId} value={String(uom.uomId)}>
+                            {uom.name}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
+                  </TableCell>
+                  <TableCell className="text-right w-28"><Input type="number" min="0" step="0.01" value={line.qty} onChange={(e) => updateLine(line.key, { qty: Number(e.target.value) })} className="text-right" /></TableCell>
+                  <TableCell className="text-right w-32"><Input type="number" min="0" step="0.01" value={line.unitPrice} onChange={(e) => updateLine(line.key, { unitPrice: Number(e.target.value) })} className="text-right" /></TableCell>
+                  <TableCell className="text-right">{line.includeInBundle ? "Yes" : "No"}</TableCell>
+                  <TableCell className="text-right">
+                    <Button type="button" variant="ghost" size="icon-sm" onClick={() => removeLine(line.key)} disabled={lines.length === 1}><Minus className="size-4" /></Button>
+                  </TableCell>
+                </TableRow>
+              ))}
+            </TableBody>
+          </Table>
+        </div>
+      </section>
+
+      <section className="rounded-2xl border bg-card p-4 shadow-sm">
+        <div className="grid gap-3 md:grid-cols-3">
+          <div><div className="text-xs text-muted-foreground">Component subtotal</div><div className="text-lg font-semibold">{componentSubtotal.toFixed(2)}</div></div>
+          <div><div className="text-xs text-muted-foreground">Bundle price</div><div className="text-lg font-semibold">{bundlePrice.toFixed(2)}</div></div>
+          <div><div className="text-xs text-muted-foreground">Margin</div><div className="text-lg font-semibold">{(bundlePrice - componentSubtotal).toFixed(2)}</div></div>
+        </div>
+      </section>
+
+      <div className="flex justify-end gap-3">
+        <Link href="/dashboard/sales/bundles" className={cn(buttonVariants({ variant: "outline", size: "lg" }))}>Cancel</Link>
+        <Button size="lg" onClick={submit} disabled={saving}>
+          <Save className="size-4" />
+          {saving ? "Saving..." : "Save draft"}
+        </Button>
+      </div>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/sales/bundles/page.tsx b/Frontend/erp-system/app/dashboard/sales/bundles/page.tsx
new file mode 100644
index 0000000..927fdc0
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/sales/bundles/page.tsx
@@ -0,0 +1,292 @@
+"use client"
+
+import { useEffect, useMemo, useState } from "react"
+import Link from "next/link"
+import { ChevronLeft, ChevronRight, Eye, Filter, FileText, Plus, Printer } from "lucide-react"
+
+import { bundleApi } from "@/lib/api/bundles"
+import { customersApi } from "@/lib/api/customers"
+import { warehousesApi } from "@/lib/api/warehouses"
+import { errorMessage } from "@/lib/error-map"
+import { Button, buttonVariants } from "@/components/ui/button"
+import { Badge } from "@/components/ui/badge"
+import { Input } from "@/components/ui/input"
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
+import { Skeleton } from "@/components/ui/skeleton"
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+import { PaginationMeta } from "@/types/common"
+import { Customer } from "@/types/customers"
+import { Warehouse } from "@/types/master-data"
+import { BundleSaleStatus, BundleSaleSummary } from "@/types/bundles"
+import { cn } from "@/lib/utils"
+
+type StatusFilter = BundleSaleStatus | "All"
+
+const PAGE_SIZE = 10
+const tabs = ["All", "Draft", "Posted", "Cancelled"] as const
+
+function statusClass(status: BundleSaleStatus) {
+  switch (status) {
+    case "Draft":
+      return "border-amber-200 bg-amber-50 text-amber-800"
+    case "Posted":
+      return "border-emerald-200 bg-emerald-50 text-emerald-800"
+    case "Cancelled":
+      return "border-rose-200 bg-rose-50 text-rose-800"
+  }
+}
+
+export default function BundleSalesPage() {
+  const [rows, setRows] = useState<BundleSaleSummary[] | null>(null)
+  const [pagination, setPagination] = useState<PaginationMeta | null>(null)
+  const [error, setError] = useState<string | null>(null)
+  const [status, setStatus] = useState<StatusFilter>("All")
+  const [customerId, setCustomerId] = useState<number | null>(null)
+  const [warehouseId, setWarehouseId] = useState<number | null>(null)
+  const [searchInput, setSearchInput] = useState("")
+  const [query, setQuery] = useState("")
+  const [page, setPage] = useState(1)
+  const [showFilters, setShowFilters] = useState(false)
+  const [customers, setCustomers] = useState<Customer[]>([])
+  const [warehouses, setWarehouses] = useState<Warehouse[]>([])
+
+  useEffect(() => {
+    const timeout = setTimeout(() => setQuery(searchInput.trim()), 300)
+    return () => clearTimeout(timeout)
+  }, [searchInput])
+
+  useEffect(() => setPage(1), [query, status, customerId, warehouseId])
+
+  useEffect(() => {
+    Promise.all([customersApi.list({ pageSize: 200 }), warehousesApi.list({ pageSize: 200 })])
+      .then(([cust, whRes]) => {
+        setCustomers(cust.items)
+        setWarehouses(whRes.items)
+      })
+      .catch((err) => setError(errorMessage(err)))
+  }, [])
+
+  useEffect(() => {
+    setError(null)
+    bundleApi
+      .listBundles({
+        page,
+        pageSize: PAGE_SIZE,
+        status: status === "All" ? undefined : status,
+        q: query || undefined,
+        customerId: customerId ?? undefined,
+        warehouseId: warehouseId ?? undefined,
+      })
+      .then((res) => {
+        setRows(res.items)
+        setPagination(res.pagination)
+      })
+      .catch((err) => setError(errorMessage(err)))
+  }, [page, status, query, customerId, warehouseId])
+
+  const visibleRows = useMemo(() => rows ?? [], [rows])
+  const hasFilters = status !== "All" || query.length > 0 || customerId !== null || warehouseId !== null
+  const bundleTotal = visibleRows.reduce((sum, row) => sum + row.grandTotal, 0)
+  const printHref = `/print/sales/bundles?status=${encodeURIComponent(status)}&q=${encodeURIComponent(query)}&customerId=${customerId ?? ""}&warehouseId=${warehouseId ?? ""}`
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+        <div>
+          <h1 className="text-2xl font-bold text-foreground">Bundle Sales</h1>
+          <p className="text-base text-muted-foreground">Fixed bundle register with draft, posted, and cancelled states.</p>
+        </div>
+        <div className="flex flex-wrap gap-2">
+          <Link href={printHref} target="_blank" rel="noopener noreferrer" className={cn(buttonVariants({ variant: "outline", size: "lg" }))}>
+            <Printer className="size-5" />
+            Print batch
+          </Link>
+          <Link href="/dashboard/sales/bundles/new" className={cn(buttonVariants({ size: "lg" }))}>
+            <Plus className="size-5" />
+            New Bundle
+          </Link>
+        </div>
+      </div>
+
+      <div className="rounded-2xl border bg-card shadow-sm">
+        <div className="flex flex-col gap-3 border-b px-4 py-4 lg:flex-row lg:items-center">
+          <div className="flex flex-wrap gap-2">
+            {tabs.map((t) => (
+              <button
+                key={t}
+                onClick={() => setStatus(t)}
+                className={cn(
+                  "rounded-full border px-3 py-1.5 text-xs font-medium transition-colors",
+                  status === t ? "border-primary bg-primary text-primary-foreground" : "border-border text-muted-foreground hover:text-foreground"
+                )}
+              >
+                {t}
+              </button>
+            ))}
+          </div>
+          <div className="flex flex-1 flex-col gap-3 lg:flex-row lg:items-center lg:justify-end">
+            <Input value={searchInput} onChange={(e) => setSearchInput(e.target.value)} placeholder="Filter by bundle, code, or customer" className="h-12 w-full lg:max-w-sm" />
+            <Button variant="outline" size="sm" className="lg:ml-auto" onClick={() => setShowFilters((v) => !v)}>
+              <Filter className="size-4" />
+              Advanced
+            </Button>
+          </div>
+        </div>
+
+        {showFilters && (
+          <div className="grid gap-4 border-b px-4 py-4 md:grid-cols-3">
+            <div className="space-y-1.5">
+              <div className="text-xs font-medium text-muted-foreground">Customer</div>
+              <Select value={customerId ? String(customerId) : "all"} onValueChange={(v) => setCustomerId(v === "all" ? null : Number(v))}>
+                <SelectTrigger className="h-10">
+                  <SelectValue placeholder="All customers" />
+                </SelectTrigger>
+                <SelectContent>
+                  <SelectItem value="all">All customers</SelectItem>
+                  {customers.map((c) => (
+                    <SelectItem key={c.customerId} value={String(c.customerId)}>
+                      {c.customerCode} - {c.displayName ?? c.name}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+            </div>
+            <div className="space-y-1.5">
+              <div className="text-xs font-medium text-muted-foreground">Warehouse</div>
+              <Select value={warehouseId ? String(warehouseId) : "all"} onValueChange={(v) => setWarehouseId(v === "all" ? null : Number(v))}>
+                <SelectTrigger className="h-10">
+                  <SelectValue placeholder="All warehouses" />
+                </SelectTrigger>
+                <SelectContent>
+                  <SelectItem value="all">All warehouses</SelectItem>
+                  {warehouses.map((w) => (
+                    <SelectItem key={w.warehouseId} value={String(w.warehouseId)}>
+                      {w.code} - {w.name}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+            </div>
+            <div className="flex items-end gap-2">
+              <Button
+                type="button"
+                variant="outline"
+                className="flex-1"
+                onClick={() => {
+                  setCustomerId(null)
+                  setWarehouseId(null)
+                  setStatus("All")
+                  setSearchInput("")
+                  setQuery("")
+                }}
+              >
+                Reset
+              </Button>
+            </div>
+          </div>
+        )}
+
+        {error && <div className="mx-4 mt-4 rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>}
+
+        {!error && rows === null && (
+          <div className="flex flex-col gap-3 px-4 py-4">
+            {Array.from({ length: 5 }).map((_, i) => (
+              <Skeleton key={i} className="h-14 w-full" />
+            ))}
+          </div>
+        )}
+
+        {!error && rows !== null && visibleRows.length === 0 && (
+          <div className="flex flex-col items-center gap-4 px-4 py-20 text-center">
+            <FileText className="size-12 text-muted-foreground" />
+            <p className="text-base text-muted-foreground">{hasFilters ? "No bundle sales match your filters." : "No bundle sales yet."}</p>
+          </div>
+        )}
+
+        {!error && rows !== null && visibleRows.length > 0 && (
+          <>
+            <div className="overflow-x-auto">
+              <Table className="text-base">
+                <TableHeader>
+                  <TableRow>
+                    <TableHead className="h-12 px-4 text-sm">Bundle</TableHead>
+                    <TableHead className="h-12 px-4 text-sm">Customer</TableHead>
+                    <TableHead className="h-12 px-4 text-sm">Date</TableHead>
+                    <TableHead className="h-12 px-4 text-sm text-right">Price</TableHead>
+                    <TableHead className="h-12 px-4 text-sm text-right">Grand</TableHead>
+                    <TableHead className="h-12 px-4 text-sm">Status</TableHead>
+                    <TableHead className="h-12 px-4 text-sm text-right">View</TableHead>
+                  </TableRow>
+                </TableHeader>
+                <TableBody>
+                  {visibleRows.map((row) => (
+                    <TableRow key={row.bundleSaleId} className="hover:bg-muted/40">
+                      <TableCell className="px-4 py-3.5 font-medium">
+                        <Link href={`/dashboard/sales/bundles/${row.bundleSaleId}`} className="hover:underline">
+                          {row.bundleNo}
+                        </Link>
+                      </TableCell>
+                      <TableCell className="px-4 py-3.5">{row.customerSnapshotName}</TableCell>
+                      <TableCell className="px-4 py-3.5 text-muted-foreground">{new Date(row.createdAt).toLocaleDateString()}</TableCell>
+                      <TableCell className="px-4 py-3.5 text-right font-mono tabular-nums">{row.bundlePrice.toFixed(2)}</TableCell>
+                      <TableCell className="px-4 py-3.5 text-right font-mono font-semibold tabular-nums">{row.grandTotal.toFixed(2)}</TableCell>
+                      <TableCell className="px-4 py-3.5">
+                        <Badge variant="outline" className={statusClass(row.status)}>
+                          {row.status}
+                        </Badge>
+                      </TableCell>
+                      <TableCell className="px-4 py-3.5 text-right">
+                        <div className="inline-flex gap-2">
+                          <Link href={`/dashboard/sales/bundles/${row.bundleSaleId}`} className={cn(buttonVariants({ variant: "ghost", size: "icon-sm" }))} aria-label={`View bundle ${row.bundleNo}`}>
+                            <Eye className="size-4" />
+                          </Link>
+                          <Link href={`/print/sales/bundles/${row.bundleSaleId}`} target="_blank" rel="noopener noreferrer" className={cn(buttonVariants({ variant: "ghost", size: "icon-sm" }))} aria-label={`Print bundle ${row.bundleNo}`}>
+                            <Printer className="size-4" />
+                          </Link>
+                        </div>
+                      </TableCell>
+                    </TableRow>
+                  ))}
+                </TableBody>
+              </Table>
+            </div>
+
+            <div className="border-t px-4 py-3">
+              <div className="grid gap-3 text-sm md:grid-cols-2">
+                <div className="rounded-lg border bg-muted/20 px-3 py-2">
+                  <div className="text-muted-foreground">Rows loaded</div>
+                  <div className="font-mono text-base font-semibold tabular-nums">{visibleRows.length}</div>
+                </div>
+                <div className="rounded-lg border bg-muted/20 px-3 py-2">
+                  <div className="text-muted-foreground">Grand total</div>
+                  <div className="font-mono text-base font-semibold tabular-nums">{bundleTotal.toFixed(2)}</div>
+                </div>
+              </div>
+            </div>
+
+            {pagination && pagination.totalPages > 1 && (
+              <div className="flex flex-col gap-3 border-t px-4 py-4 sm:flex-row sm:items-center sm:justify-between">
+                <p className="text-sm text-muted-foreground">
+                  Showing {(pagination.page - 1) * pagination.pageSize + 1}-{Math.min(pagination.page * pagination.pageSize, pagination.totalItems)} of {pagination.totalItems}
+                </p>
+                <div className="flex items-center gap-2">
+                  <Button type="button" variant="outline" size="sm" disabled={pagination.page <= 1} onClick={() => setPage((p) => Math.max(1, p - 1))}>
+                    <ChevronLeft />
+                    Previous
+                  </Button>
+                  <span className="text-sm text-muted-foreground">
+                    Page {pagination.page} of {pagination.totalPages}
+                  </span>
+                  <Button type="button" variant="outline" size="sm" disabled={pagination.page >= pagination.totalPages} onClick={() => setPage((p) => Math.min(pagination.totalPages, p + 1))}>
+                    Next
+                    <ChevronRight />
+                  </Button>
+                </div>
+              </div>
+            )}
+          </>
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/sales/bundles/register/page.tsx b/Frontend/erp-system/app/dashboard/sales/bundles/register/page.tsx
new file mode 100644
index 0000000..ade96a5
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/sales/bundles/register/page.tsx
@@ -0,0 +1,5 @@
+import { redirect } from "next/navigation"
+
+export default function BundleRegisterPage() {
+  redirect("/dashboard/sales/bundles")
+}
diff --git a/Frontend/erp-system/app/dashboard/sales/bundles/reports/page.tsx b/Frontend/erp-system/app/dashboard/sales/bundles/reports/page.tsx
new file mode 100644
index 0000000..b6022c6
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/sales/bundles/reports/page.tsx
@@ -0,0 +1,27 @@
+"use client"
+
+import Link from "next/link"
+import { ArrowLeft, FileText } from "lucide-react"
+
+import { buttonVariants } from "@/components/ui/button"
+import { cn } from "@/lib/utils"
+
+export default function BundleReportsPage() {
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex items-center gap-3">
+        <Link href="/dashboard/sales/bundles" className={cn(buttonVariants({ variant: "outline", size: "icon" }))}>
+          <ArrowLeft className="size-4" />
+        </Link>
+        <div>
+          <h1 className="text-2xl font-bold text-foreground">Bundle Reports</h1>
+          <p className="text-base text-muted-foreground">Bundle-level reporting will be added after the backend module is wired.</p>
+        </div>
+      </div>
+      <div className="rounded-2xl border border-dashed p-8 text-muted-foreground">
+        <FileText className="mb-3 size-6" />
+        This screen is a placeholder for bundle sales reporting.
+      </div>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/sales/free-issues/new/page.tsx b/Frontend/erp-system/app/dashboard/sales/free-issues/new/page.tsx
new file mode 100644
index 0000000..2dced6d
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/sales/free-issues/new/page.tsx
@@ -0,0 +1,494 @@
+"use client"
+
+import { useEffect, useState } from "react"
+import Link from "next/link"
+import { ArrowLeft, Pencil, Plus, Save, Trash2, X } from "lucide-react"
+
+import { Button, buttonVariants } from "@/components/ui/button"
+import { Input } from "@/components/ui/input"
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+import { cn } from "@/lib/utils"
+import { errorMessage } from "@/lib/error-map"
+import { salesApi } from "@/lib/api/sales"
+import { customersApi } from "@/lib/api/customers"
+import { itemsApi } from "@/lib/api/items"
+import { uomsApi } from "@/lib/api/uoms"
+import { warehousesApi } from "@/lib/api/warehouses"
+import { usersApi } from "@/lib/api/users"
+import { toast } from "@/components/ui/toast"
+import { Customer } from "@/types/customers"
+import { ItemListItem, Uom, Warehouse } from "@/types/master-data"
+import { ManagedUser } from "@/types/users"
+import { CreateSalesSlipLineRequest, CreateSalesSlipRequest } from "@/types/sales"
+
+type Line = CreateSalesSlipLineRequest & { key: string }
+
+type FreeIssueRow = {
+  salesSlipId: number
+  slipNo: string
+  status: string
+  etag: string
+  warehouseName: string
+  itemName: string
+  itemSku: string
+  uomName: string
+  qty: number
+  freeQty: number
+}
+
+const blankLine = (key: string): Line => ({
+  key,
+  itemId: 0,
+  uomId: 0,
+  warehouseId: 0,
+  qty: 1,
+  freeQty: 0,
+  allowManualPriceOverride: true,
+  discountMode: "Percentage",
+  discountPct: 0,
+  discountAmount: 0,
+  discountValue: 0,
+  taxPct: 0,
+  isFreeIssue: false,
+  parentLineId: null,
+})
+
+export default function NewFreeIssuePage() {
+  const [customers, setCustomers] = useState<Customer[]>([])
+  const [items, setItems] = useState<ItemListItem[]>([])
+  const [uoms, setUoms] = useState<Uom[]>([])
+  const [warehouses, setWarehouses] = useState<Warehouse[]>([])
+  const [users, setUsers] = useState<ManagedUser[]>([])
+  const [customerId, setCustomerId] = useState<number | null>(null)
+  const [warehouseId, setWarehouseId] = useState<number | null>(null)
+  const [cashierUserId, setCashierUserId] = useState<number | null>(null)
+  const [lines, setLines] = useState<Line[]>([blankLine("line-1")])
+  const [rows, setRows] = useState<FreeIssueRow[]>([])
+  const [editingRowId, setEditingRowId] = useState<number | null>(null)
+  const [editingLines, setEditingLines] = useState<Line[]>([])
+  const [loading, setLoading] = useState(true)
+  const [saving, setSaving] = useState(false)
+  const [error, setError] = useState<string | null>(null)
+
+  async function refreshRows() {
+    const list = await salesApi.listFreeIssues({ pageSize: 50 })
+    const details = await Promise.all(
+      list.items.map(async (summary) => {
+        const detail = await salesApi.getFreeIssue(summary.salesSlipId)
+        const firstLine = detail.data.lines[0]
+        const item = items.find((x) => x.itemId === firstLine?.itemId)
+        const uom = uoms.find((x) => x.uomId === firstLine?.uomId)
+        const warehouse = warehouses.find((x) => x.warehouseId === detail.data.warehouseId)
+        return {
+          salesSlipId: detail.data.salesSlipId,
+          slipNo: detail.data.slipNo,
+          status: detail.data.status,
+          etag: detail.etag ?? "",
+          warehouseName: warehouse?.name ?? `Warehouse ${detail.data.warehouseId}`,
+          itemName: item?.name ?? firstLine?.description ?? "—",
+          itemSku: item?.sku ?? `SKU-${firstLine?.itemId ?? 0}`,
+          uomName: uom?.name ?? `UOM ${firstLine?.uomId ?? 0}`,
+          qty: firstLine?.qty ?? 0,
+          freeQty: firstLine?.freeQty ?? 0,
+        } satisfies FreeIssueRow
+      }),
+    )
+    setRows(details.filter((row) => row.status !== "Cancelled"))
+  }
+
+  useEffect(() => {
+    Promise.all([
+      customersApi.list({ pageSize: 200 }),
+      itemsApi.list({ pageSize: 200 }),
+      uomsApi.list({ pageSize: 200 }),
+      warehousesApi.list({ pageSize: 200 }),
+      usersApi.list({ pageSize: 200 }),
+    ])
+      .then(async ([cust, itemRes, uomRes, whRes, userRes]) => {
+        setCustomers(cust.items)
+        setItems(itemRes.items)
+        setUoms(uomRes.items)
+        setWarehouses(whRes.items)
+        setUsers(userRes.items)
+        setCustomerId(cust.items[0]?.customerId ?? null)
+        setWarehouseId(whRes.items[0]?.warehouseId ?? null)
+        setCashierUserId(userRes.items[0]?.userId ?? null)
+        setLines([
+          {
+            ...blankLine("line-1"),
+            itemId: itemRes.items[0]?.itemId ?? 0,
+            uomId: itemRes.items[0]?.baseUomId ?? uomRes.items[0]?.uomId ?? 0,
+            warehouseId: whRes.items[0]?.warehouseId ?? 0,
+          },
+        ])
+        await refreshRows()
+      })
+      .catch((err) => setError(errorMessage(err)))
+      .finally(() => setLoading(false))
+  }, [])
+
+  function updateLine(key: string, patch: Partial<Line>) {
+    setLines((prev) => prev.map((line) => (line.key === key ? { ...line, ...patch } : line)))
+  }
+
+  function updateEditingLine(key: string, patch: Partial<Line>) {
+    setEditingLines((prev) => prev.map((line) => (line.key === key ? { ...line, ...patch } : line)))
+  }
+
+  function addLine() {
+    setLines((prev) => [...prev, blankLine(`line-${Date.now()}`)])
+  }
+
+  function removeLine(key: string) {
+    setLines((prev) => (prev.length === 1 ? prev : prev.filter((line) => line.key !== key)))
+  }
+
+  function selectItem(key: string, itemId: number) {
+    const item = items.find((candidate) => candidate.itemId === itemId)
+    updateLine(key, { itemId, uomId: item?.baseUomId ?? 0 })
+  }
+
+  function selectEditingItem(key: string, itemId: number) {
+    const item = items.find((candidate) => candidate.itemId === itemId)
+    updateEditingLine(key, { itemId, uomId: item?.baseUomId ?? 0 })
+  }
+
+  async function submit() {
+    const activeLines = editingRowId ? editingLines : lines
+    if (!customerId || !warehouseId || !cashierUserId) return setError("Select customer, warehouse, and cashier.")
+    if (activeLines.some((line) => !line.itemId)) return setError("Select an item for every line.")
+    if (activeLines.some((line) => !line.uomId)) return setError("Select a valid UOM for every line.")
+    if (activeLines.some((line) => !line.warehouseId)) return setError("Select a warehouse for every line.")
+
+    setSaving(true)
+    setError(null)
+    try {
+      const payload: CreateSalesSlipRequest = {
+        customerId,
+        warehouseId,
+        cashierUserId,
+        lines: activeLines.map((line) => ({
+          itemId: Number(line.itemId),
+          uomId: Number(line.uomId),
+          warehouseId: Number(line.warehouseId),
+          qty: Number(line.qty),
+          freeQty: Number(line.freeQty),
+          unitPrice: line.unitPrice === null ? null : Number(line.unitPrice),
+          allowManualPriceOverride: line.allowManualPriceOverride,
+          discountMode: line.discountMode,
+          discountPct: Number(line.discountPct),
+          discountAmount: Number(line.discountAmount),
+          discountValue: Number(line.discountValue),
+          taxPct: Number(line.taxPct),
+          isFreeIssue: line.isFreeIssue,
+          parentLineId: line.parentLineId ?? null,
+        })),
+      }
+
+      if (editingRowId) {
+        const latest = await salesApi.getFreeIssue(editingRowId)
+        if (!latest.etag) throw new Error("Missing ETag for free issue update.")
+        await salesApi.updateFreeIssue(editingRowId, payload, latest.etag)
+        toast.success("Free issue updated")
+        setEditingRowId(null)
+        setEditingLines([])
+      } else {
+        const created = await salesApi.createFreeIssue(payload)
+        toast.success("Free issue created", created.data.slipNo)
+      }
+
+      setLines([blankLine("line-1")])
+      await refreshRows()
+    } catch (err) {
+      setError(errorMessage(err))
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  async function startEdit(row: FreeIssueRow) {
+    try {
+      const detail = await salesApi.getFreeIssue(row.salesSlipId)
+      const detailLine = detail.data.lines[0]
+      setEditingRowId(row.salesSlipId)
+      setCustomerId(detail.data.customerId)
+      setWarehouseId(detail.data.warehouseId)
+      setCashierUserId(detail.data.cashierUserId)
+      setEditingLines([
+        {
+          key: "edit-line-1",
+          itemId: detailLine?.itemId ?? 0,
+          uomId: detailLine?.uomId ?? 0,
+          warehouseId: detailLine?.warehouseId ?? detail.data.warehouseId,
+          qty: detailLine?.qty ?? 1,
+          freeQty: detailLine?.freeQty ?? 0,
+          unitPrice: detailLine?.unitPrice ?? null,
+          allowManualPriceOverride: true,
+          discountMode: detailLine?.discountMode ?? "Percentage",
+          discountPct: detailLine?.discountPct ?? 0,
+          discountAmount: detailLine?.discountAmount ?? 0,
+          discountValue: 0,
+          taxPct: detailLine?.taxPct ?? 0,
+          isFreeIssue: detailLine?.isFreeIssue ?? false,
+          parentLineId: detailLine?.parentLineId ?? null,
+        },
+      ])
+    } catch (err) {
+      setError(errorMessage(err))
+    }
+  }
+
+  function cancelEdit() {
+    setEditingRowId(null)
+    setEditingLines([])
+  }
+
+  async function deleteRow(row: FreeIssueRow) {
+    if (row.status !== "Draft") return
+    try {
+      await salesApi.cancelFreeIssue(row.salesSlipId)
+      toast.success("Free issue cancelled", row.slipNo)
+      if (editingRowId === row.salesSlipId) cancelEdit()
+      await refreshRows()
+    } catch (err) {
+      setError(errorMessage(err))
+    }
+  }
+
+  if (loading) {
+    return <div className="rounded-2xl border border-border bg-card p-8 text-muted-foreground shadow-[var(--shadow-panel)]">Loading masters...</div>
+  }
+
+  const activeLines = editingRowId ? editingLines : lines
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+        <div className="flex items-center gap-3">
+          <Link href="/dashboard/sales" className={cn(buttonVariants({ variant: "outline", size: "icon" }))}>
+            <ArrowLeft className="size-4" />
+          </Link>
+          <div>
+            <h1 className="text-2xl font-bold text-foreground">Free Issues</h1>
+            <p className="text-base text-muted-foreground">Create and manage free-issue sales slips from the backend.</p>
+          </div>
+        </div>
+        <Button size="sm" onClick={submit} disabled={saving}>
+          <Save className="size-4" /> {saving ? "Saving..." : editingRowId ? "Update free issue" : "Create free issue"}
+        </Button>
+      </div>
+
+      {error ? <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div> : null}
+
+      {editingRowId ? (
+        <section className="rounded-2xl border border-sky-200 bg-sky-50 shadow-[var(--shadow-panel)]">
+          <div className="flex items-center justify-between border-b border-sky-200 px-4 py-3">
+            <h2 className="text-sm font-semibold text-sky-900">Inline edit free issue</h2>
+            <Button type="button" variant="outline" size="sm" onClick={cancelEdit}>
+              <X className="size-4" /> Cancel edit
+            </Button>
+          </div>
+          <div className="overflow-x-auto">
+            <Table className="text-sm">
+              <TableHeader>
+                <TableRow>
+                  <TableHead className="h-12 px-4 text-sm">ID</TableHead>
+                  <TableHead className="h-12 px-4 text-sm">Item</TableHead>
+                  <TableHead className="h-12 px-4 text-sm">UOM</TableHead>
+                  <TableHead className="h-12 px-4 text-sm text-right">Qty</TableHead>
+                  <TableHead className="h-12 px-4 text-sm text-right">Free</TableHead>
+                  <TableHead className="h-12 px-4 text-sm" />
+                </TableRow>
+              </TableHeader>
+              <TableBody>
+                {activeLines.map((line, idx) => (
+                  <TableRow key={line.key} className="align-middle">
+                    <TableCell className="px-4 py-2 text-xs text-muted-foreground">{idx + 1}</TableCell>
+                    <TableCell className="px-4 py-2 min-w-80">
+                      <Select value={line.itemId ? String(line.itemId) : ""} onValueChange={(v) => selectEditingItem(line.key, Number(v))}>
+                        <SelectTrigger className="h-9 text-sm">
+                          <SelectValue placeholder="Select item" />
+                        </SelectTrigger>
+                        <SelectContent>
+                          {items.map((candidate) => (
+                            <SelectItem key={candidate.itemId} value={String(candidate.itemId)}>
+                              {candidate.sku} - {candidate.name}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
+                    </TableCell>
+                    <TableCell className="px-4 py-2 min-w-44">
+                      <Select value={line.uomId ? String(line.uomId) : ""} onValueChange={(v) => updateEditingLine(line.key, { uomId: Number(v) })}>
+                        <SelectTrigger className="h-9 text-sm">
+                          <SelectValue placeholder="UOM" />
+                        </SelectTrigger>
+                        <SelectContent>
+                          {uoms.map((u) => (
+                            <SelectItem key={u.uomId} value={String(u.uomId)}>
+                              {u.name}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
+                    </TableCell>
+                    <TableCell className="px-4 py-2">
+                      <Input type="number" min="0" step="1" value={line.qty} onChange={(e) => updateEditingLine(line.key, { qty: Number(e.target.value) })} className="h-9 w-24 text-right font-mono text-sm tabular-nums" />
+                    </TableCell>
+                    <TableCell className="px-4 py-2">
+                      <Input type="number" min="0" step="1" value={line.freeQty} onChange={(e) => updateEditingLine(line.key, { freeQty: Number(e.target.value) })} className="h-9 w-24 text-right font-mono text-sm tabular-nums" />
+                    </TableCell>
+                    <TableCell className="px-4 py-2 text-right text-xs text-muted-foreground">editing</TableCell>
+                  </TableRow>
+                ))}
+              </TableBody>
+            </Table>
+          </div>
+        </section>
+      ) : (
+        <section className="rounded-2xl border border-border bg-card shadow-[var(--shadow-panel)]">
+          <div className="flex items-center justify-between border-b border-border px-4 py-3">
+            <h2 className="text-sm font-semibold">Free issue lines</h2>
+            <Button type="button" variant="outline" size="sm" onClick={addLine}>
+              <Plus className="size-4" /> Add line
+            </Button>
+          </div>
+          <div className="overflow-x-auto">
+            <Table className="text-sm">
+              <TableHeader>
+                <TableRow>
+                  <TableHead className="h-12 px-4 text-sm">ID</TableHead>
+                  <TableHead className="h-12 px-4 text-sm">Item</TableHead>
+                  <TableHead className="h-12 px-4 text-sm">UOM</TableHead>
+                  <TableHead className="h-12 px-4 text-sm text-right">Qty</TableHead>
+                  <TableHead className="h-12 px-4 text-sm text-right">Free</TableHead>
+                  <TableHead className="h-12 px-4 text-sm" />
+                </TableRow>
+              </TableHeader>
+              <TableBody>
+                {lines.map((line, idx) => (
+                  <TableRow key={line.key} className="align-middle">
+                    <TableCell className="px-4 py-2 text-xs text-muted-foreground">{idx + 1}</TableCell>
+                    <TableCell className="px-4 py-2 min-w-80">
+                      <Select value={line.itemId ? String(line.itemId) : ""} onValueChange={(v) => selectItem(line.key, Number(v))}>
+                        <SelectTrigger className="h-9 text-sm">
+                          <SelectValue placeholder="Select item" />
+                        </SelectTrigger>
+                        <SelectContent>
+                          {items.map((candidate) => (
+                            <SelectItem key={candidate.itemId} value={String(candidate.itemId)}>
+                              {candidate.sku} - {candidate.name}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
+                    </TableCell>
+                    <TableCell className="px-4 py-2 min-w-44">
+                      <Select value={line.uomId ? String(line.uomId) : ""} onValueChange={(v) => updateLine(line.key, { uomId: Number(v) })}>
+                        <SelectTrigger className="h-9 text-sm">
+                          <SelectValue placeholder="UOM" />
+                        </SelectTrigger>
+                        <SelectContent>
+                          {uoms.map((u) => (
+                            <SelectItem key={u.uomId} value={String(u.uomId)}>
+                              {u.name}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
+                    </TableCell>
+                    <TableCell className="px-4 py-2">
+                      <Input type="number" min="0" step="1" value={line.qty} onChange={(e) => updateLine(line.key, { qty: Number(e.target.value) })} className="h-9 w-24 text-right font-mono text-sm tabular-nums" />
+                    </TableCell>
+                    <TableCell className="px-4 py-2">
+                      <Input type="number" min="0" step="1" value={line.freeQty} onChange={(e) => updateLine(line.key, { freeQty: Number(e.target.value) })} className="h-9 w-24 text-right font-mono text-sm tabular-nums" />
+                    </TableCell>
+                    <TableCell className="px-4 py-2 text-right">
+                      <Button variant="ghost" size="icon" className="size-8 text-muted-foreground" onClick={() => removeLine(line.key)} disabled={lines.length === 1}>
+                        <Trash2 className="size-4" />
+                      </Button>
+                    </TableCell>
+                  </TableRow>
+                ))}
+              </TableBody>
+            </Table>
+          </div>
+        </section>
+      )}
+
+      <section className="rounded-2xl border border-border bg-card p-4 shadow-[var(--shadow-panel)]">
+        <div className="flex items-center justify-between">
+          <div>
+            <h3 className="text-sm font-semibold">Created free issues</h3>
+            <p className="mt-1 text-xs text-muted-foreground">Persisted backend records with draft-only cancellation.</p>
+          </div>
+          <Button variant="outline" size="sm" onClick={refreshRows}>
+            Refresh
+          </Button>
+        </div>
+        <div className="mt-3 overflow-x-auto">
+          <Table className="text-sm">
+            <TableHeader>
+              <TableRow>
+                <TableHead className="h-12 px-4 text-sm">Promotion</TableHead>
+                <TableHead className="h-12 px-4 text-sm">Warehouse</TableHead>
+                <TableHead className="h-12 px-4 text-sm">Product</TableHead>
+                <TableHead className="h-12 px-4 text-sm text-right">Qty</TableHead>
+                <TableHead className="h-12 px-4 text-sm text-right">Free</TableHead>
+                <TableHead className="h-12 px-4 text-sm text-right">Actions</TableHead>
+              </TableRow>
+            </TableHeader>
+            <TableBody>
+              {rows.length > 0 ? (
+                rows.map((row) => (
+                  <TableRow key={row.salesSlipId} className="hover:bg-muted/40">
+                    <TableCell className="px-4 py-3.5">
+                      <div className="font-medium">Buy {row.qty} Get {row.freeQty || 0}</div>
+                      <div className="text-xs text-muted-foreground">{row.slipNo}</div>
+                    </TableCell>
+                    <TableCell className="px-4 py-3.5">{row.warehouseName}</TableCell>
+                    <TableCell className="px-4 py-3.5 min-w-80">
+                      <div className="font-medium">{row.itemName}</div>
+                      <div className="text-xs text-muted-foreground">{row.itemSku} · {row.uomName}</div>
+                    </TableCell>
+                    <TableCell className="px-4 py-3.5 text-right font-mono tabular-nums">{row.qty}</TableCell>
+                    <TableCell className="px-4 py-3.5 text-right font-mono tabular-nums">{row.freeQty}</TableCell>
+                    <TableCell className="px-4 py-3.5">
+                      <div className="flex justify-end gap-1.5">
+                        <button
+                          type="button"
+                          onClick={() => startEdit(row)}
+                          className="inline-flex h-7 items-center rounded-full border border-sky-200 bg-sky-50 px-2 text-xs text-sky-700 hover:bg-sky-100 hover:text-sky-800"
+                        >
+                          <Pencil className="mr-1 size-3.5" />
+                          Edit
+                        </button>
+                        {row.status === "Draft" ? (
+                          <button
+                            type="button"
+                            onClick={() => deleteRow(row)}
+                            className="inline-flex h-7 items-center rounded-full border border-rose-200 bg-rose-50 px-2 text-xs text-rose-700 hover:bg-rose-100 hover:text-rose-800"
+                          >
+                            <Trash2 className="mr-1 size-3.5" />
+                            Delete
+                          </button>
+                        ) : null}
+                      </div>
+                    </TableCell>
+                  </TableRow>
+                ))
+              ) : (
+                <TableRow>
+                  <TableCell colSpan={6} className="px-4 py-8 text-center text-sm text-muted-foreground">
+                    No free issues created yet.
+                  </TableCell>
+                </TableRow>
+              )}
+            </TableBody>
+          </Table>
+        </div>
+      </section>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/sales/free-issues/page.tsx b/Frontend/erp-system/app/dashboard/sales/free-issues/page.tsx
new file mode 100644
index 0000000..474a1ae
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/sales/free-issues/page.tsx
@@ -0,0 +1,3 @@
+"use client"
+
+export { default } from "./new/page"
diff --git a/Frontend/erp-system/app/dashboard/sales/invoices/[id]/page.tsx b/Frontend/erp-system/app/dashboard/sales/invoices/[id]/page.tsx
new file mode 100644
index 0000000..269be9b
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/sales/invoices/[id]/page.tsx
@@ -0,0 +1,601 @@
+"use client"
+
+import { use, useEffect, useMemo, useState } from "react"
+import Link from "next/link"
+import { useRouter } from "next/navigation"
+import { ArrowLeft, Minus, Plus, Printer, Save, Send, X } from "lucide-react"
+
+import { salesApi } from "@/lib/api/sales"
+import { customersApi } from "@/lib/api/customers"
+import { itemsApi } from "@/lib/api/items"
+import { uomsApi } from "@/lib/api/uoms"
+import { warehousesApi } from "@/lib/api/warehouses"
+import { errorMessage } from "@/lib/error-map"
+import { cn } from "@/lib/utils"
+import { getSuggestedUnitPrice } from "@/lib/sales-line-utils"
+import { Customer } from "@/types/customers"
+import { ItemListItem, Uom, Warehouse } from "@/types/master-data"
+import { CreateSalesInvoiceLineRequest, SalesInvoice, SalesInvoicePostingCheck, SalesInvoiceStatus, SalesInvoiceType } from "@/types/sales"
+import { toast } from "@/components/ui/toast"
+import { Label } from "@/components/ui/label"
+
+type Line = CreateSalesInvoiceLineRequest & { key: string }
+
+const money = new Intl.NumberFormat("en-LK", {
+  style: "currency",
+  currency: "LKR",
+  minimumFractionDigits: 2,
+})
+
+const blankLine = (key: string): Line => ({
+  key,
+  itemId: 0,
+  uomId: 0,
+  warehouseId: 0,
+  qty: 1,
+  freeQty: 0,
+  unitPrice: null,
+  allowManualPriceOverride: true,
+  discountMode: "Percentage",
+  discountPct: 0,
+  discountAmount: 0,
+  discountValue: 0,
+  taxPct: 0,
+  isFreeIssue: false,
+  parentLineId: null,
+})
+
+function statusClass(status: SalesInvoiceStatus) {
+  switch (status) {
+    case "Draft":
+      return "border-amber-200 bg-amber-50 text-amber-800"
+    case "Posted":
+      return "border-emerald-200 bg-emerald-50 text-emerald-800"
+    case "Cancelled":
+      return "border-rose-200 bg-rose-50 text-rose-800"
+  }
+}
+
+export default function SalesInvoiceDetailPage({ params }: { params: Promise<{ id: string }> }) {
+  const router = useRouter()
+  const resolvedParams = use(params)
+  const invoiceId = Number(resolvedParams.id)
+
+  const [invoice, setInvoice] = useState<SalesInvoice | null>(null)
+  const [customers, setCustomers] = useState<Customer[]>([])
+  const [items, setItems] = useState<ItemListItem[]>([])
+  const [uoms, setUoms] = useState<Uom[]>([])
+  const [warehouses, setWarehouses] = useState<Warehouse[]>([])
+  const [lines, setLines] = useState<Line[]>([blankLine("line-1")])
+  const [customerId, setCustomerId] = useState<number | null>(null)
+  const [warehouseId, setWarehouseId] = useState<number | null>(null)
+  const [invoiceType, setInvoiceType] = useState<SalesInvoiceType>("B2C")
+  const [etag, setEtag] = useState<string | null>(null)
+  const [postingCheck, setPostingCheck] = useState<SalesInvoicePostingCheck | null>(null)
+  const [error, setError] = useState<string | null>(null)
+  const [saving, setSaving] = useState(false)
+  const [busy, setBusy] = useState<"post" | "cancel" | null>(null)
+
+  useEffect(() => {
+    if (!Number.isFinite(invoiceId)) {
+      setError(`Invalid invoice id '${resolvedParams.id}'.`)
+      return
+    }
+
+    Promise.all([
+      customersApi.list({ pageSize: 200 }),
+      itemsApi.list({ pageSize: 200 }),
+      uomsApi.list({ pageSize: 200 }),
+      warehousesApi.list({ pageSize: 200 }),
+      salesApi.getInvoice(invoiceId),
+    ])
+      .then(([customerRes, itemRes, uomRes, warehouseRes, doc]) => {
+        setCustomers(customerRes.items)
+        setItems(itemRes.items)
+        setUoms(uomRes.items)
+        setWarehouses(warehouseRes.items)
+        setInvoice(doc.data)
+        setEtag(doc.etag)
+        setCustomerId(doc.data.customerId)
+        setWarehouseId(doc.data.warehouseId)
+        setInvoiceType(doc.data.invoiceType)
+        setLines(
+          doc.data.lines.map((line) => ({
+            key: String(line.salesInvoiceLineId),
+            itemId: line.itemId,
+            uomId: line.uomId,
+            warehouseId: line.warehouseId,
+            qty: line.qty,
+            freeQty: line.freeQty,
+            unitPrice: line.unitPrice,
+            allowManualPriceOverride: true,
+            discountMode: line.discountMode,
+            discountPct: line.discountPct,
+            discountAmount: line.discountAmount,
+            discountValue: 0,
+            taxPct: line.taxPct,
+            isFreeIssue: line.isFreeIssue,
+            parentLineId: line.parentLineId,
+          }))
+        )
+      })
+      .catch((err) => setError(errorMessage(err)))
+  }, [invoiceId, resolvedParams.id])
+
+  useEffect(() => {
+    if (!invoice || invoice.status !== "Draft") {
+      setPostingCheck(null)
+      return
+    }
+    salesApi
+      .checkInvoicePosting(invoiceId)
+      .then((result) => setPostingCheck(result))
+      .catch(() => setPostingCheck(null))
+  }, [invoice, invoiceId])
+
+  const isDraft = invoice?.status === "Draft"
+  const customer = useMemo(() => customers.find((c) => c.customerId === invoice?.customerId), [customers, invoice?.customerId])
+  const warehouse = useMemo(() => warehouses.find((w) => w.warehouseId === invoice?.warehouseId), [warehouses, invoice?.warehouseId])
+  const freeQtyTotal = invoice?.totals.freeQtyTotal ?? 0
+  const canPost = invoice?.status === "Draft" && (postingCheck?.canPost ?? true) && !busy && !saving
+
+  function updateLine(key: string, patch: Partial<Line>) {
+    setLines((prev) => prev.map((line) => (line.key === key ? { ...line, ...patch } : line)))
+  }
+
+  function updateHeaderWarehouse(nextWarehouseId: number | null) {
+    setWarehouseId(nextWarehouseId)
+    setLines((prev) => prev.map((line) => ({ ...line, warehouseId: nextWarehouseId ?? line.warehouseId })))
+  }
+
+  function selectItem(key: string, itemId: number) {
+    const item = items.find((candidate) => candidate.itemId === itemId)
+    updateLine(key, {
+      itemId,
+      uomId: item?.baseUomId ?? 0,
+      unitPrice: getSuggestedUnitPrice(items, itemId),
+    })
+  }
+
+  function addLine() {
+    setLines((prev) => [...prev, { ...blankLine(`line-${Date.now()}`), warehouseId: warehouseId ?? 0 }])
+  }
+
+  function removeLine(key: string) {
+    setLines((prev) => (prev.length === 1 ? prev : prev.filter((line) => line.key !== key)))
+  }
+
+  async function save() {
+    if (!customerId || !warehouseId || !etag) return
+    if (lines.some((line) => !line.itemId || !line.uomId || !line.warehouseId)) {
+      setError("Select item, UOM and warehouse for every line.")
+      return
+    }
+
+    setSaving(true)
+    setError(null)
+    try {
+      const updated = await salesApi.updateInvoice(
+        invoiceId,
+        {
+          customerId,
+          warehouseId,
+          invoiceType,
+          lines: lines.map((line) => ({
+            itemId: Number(line.itemId),
+            uomId: Number(line.uomId),
+            warehouseId: Number(line.warehouseId),
+            qty: Number(line.qty),
+            freeQty: Number(line.freeQty),
+            unitPrice: line.unitPrice === null ? null : Number(line.unitPrice),
+            allowManualPriceOverride: line.allowManualPriceOverride,
+            discountMode: line.discountMode,
+            discountPct: Number(line.discountPct),
+            discountAmount: Number(line.discountAmount),
+            discountValue: Number(line.discountValue),
+            taxPct: Number(line.taxPct),
+            isFreeIssue: line.isFreeIssue,
+            parentLineId: line.parentLineId || null,
+          })),
+        },
+        etag,
+      )
+      setInvoice(updated.data)
+      setEtag(updated.etag)
+      toast.success("Invoice saved", updated.data.invoiceNo)
+    } catch (err) {
+      setError(errorMessage(err))
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  async function post() {
+    if (!postingCheck?.canPost) {
+      setError("Resolve stock shortages before posting this invoice.")
+      return
+    }
+    setBusy("post")
+    setError(null)
+    try {
+      const posted = await salesApi.postInvoice(invoiceId)
+      setInvoice(posted)
+      toast.success("Invoice posted", posted.invoiceNo)
+      router.refresh()
+    } catch (err) {
+      setError(errorMessage(err))
+    } finally {
+      setBusy(null)
+    }
+  }
+
+  async function cancel() {
+    setBusy("cancel")
+    setError(null)
+    try {
+      const cancelled = await salesApi.cancelInvoice(invoiceId)
+      setInvoice(cancelled)
+      toast.success("Invoice cancelled", cancelled.invoiceNo)
+      router.refresh()
+    } catch (err) {
+      setError(errorMessage(err))
+    } finally {
+      setBusy(null)
+    }
+  }
+
+  if (error && !invoice) {
+    return <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-destructive">{error}</div>
+  }
+
+  if (!invoice) {
+    return <div className="rounded-2xl border border-dashed p-8 text-muted-foreground">{error ?? "Invoice data is loading or unavailable."}</div>
+  }
+
+  return (
+    <div className="mx-auto flex w-full max-w-5xl flex-col gap-6">
+      <div className="flex items-center justify-between gap-3 print:hidden">
+        <div className="flex items-center gap-3">
+          <Link href="/dashboard/sales/invoices" className={cn("inline-flex h-10 w-10 items-center justify-center rounded-full border border-black bg-white text-sm font-medium shadow-sm hover:bg-muted")}>
+            <ArrowLeft className="size-4" />
+          </Link>
+          <div>
+            <h1 className="text-2xl font-bold text-foreground">Invoice Details</h1>
+            <p className="text-base text-muted-foreground">{invoice.invoiceNo}</p>
+          </div>
+        </div>
+        <Link
+          href={`/print/sales/invoices/${invoice.salesInvoiceId}`}
+          target="_blank"
+          rel="noopener noreferrer"
+          className={cn("inline-flex h-10 items-center gap-2 rounded-full border border-black bg-white px-4 text-sm font-medium shadow-sm hover:bg-muted")}
+        >
+          <Printer className="size-4" />
+          Print
+        </Link>
+      </div>
+
+      {error ? <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-destructive">{error}</div> : null}
+
+      <section className="bg-white print:bg-white">
+        <div className="border-b pb-4">
+          <div className="flex flex-col gap-3 md:flex-row md:items-start md:justify-between">
+            <div>
+            <div className="text-xs font-semibold uppercase tracking-[0.35em] text-muted-foreground">Sales Invoice</div>
+            <h2 className="mt-2 text-3xl font-semibold text-foreground">{invoice.invoiceNo}</h2>
+            <div className="mt-1 flex flex-wrap items-center gap-2 text-sm text-muted-foreground">
+                <span>Status:</span>
+                <span className={cn("inline-flex rounded-full border px-2 py-0.5 text-xs font-medium", statusClass(invoice.status))}>{invoice.status}</span>
+                <span>Type: {invoice.invoiceType}</span>
+                <span>Date: {new Date(invoice.invoiceDate).toLocaleDateString()}</span>
+              </div>
+            </div>
+            <div className="text-sm md:text-right">
+              <div className="font-semibold text-foreground">ERP Core Trading</div>
+              <div className="text-muted-foreground">Company details are not configured for this invoice view.</div>
+            </div>
+          </div>
+        </div>
+
+        <div className="grid gap-6 py-5 md:grid-cols-3">
+          <div>
+            <div className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Bill To</div>
+            <div className="mt-2 font-semibold text-foreground">{invoice.customerSnapshotName}</div>
+            <div className="text-sm text-muted-foreground">Customer ID: {invoice.customerId}</div>
+            {customer?.displayName ? <div className="text-sm text-muted-foreground">Registered name: {customer.displayName}</div> : null}
+            {invoice.customerSnapshotTaxNo ? <div className="text-sm text-muted-foreground">Tax No: {invoice.customerSnapshotTaxNo}</div> : null}
+          </div>
+          <div>
+            <div className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Warehouse</div>
+            <div className="mt-2 font-semibold text-foreground">{warehouse?.name ?? `#${invoice.warehouseId}`}</div>
+            <div className="text-sm text-muted-foreground">Code: {warehouse?.code ?? invoice.warehouseId}</div>
+            <div className="text-sm text-muted-foreground">Location: {warehouse?.location ?? "—"}</div>
+          </div>
+          <div>
+            <div className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Totals</div>
+            <div className="mt-2 grid grid-cols-2 gap-2 text-sm">
+              <div className="text-muted-foreground">Subtotal</div>
+              <div className="text-right font-medium">{money.format(invoice.totals.subtotal)}</div>
+              <div className="text-muted-foreground">Discount</div>
+              <div className="text-right font-medium">{money.format(invoice.totals.discountTotal)}</div>
+              <div className="text-muted-foreground">Free qty</div>
+              <div className="text-right font-medium">{freeQtyTotal.toFixed(0)}</div>
+              <div className="text-muted-foreground">Tax</div>
+              <div className="text-right font-medium">{money.format(invoice.totals.taxTotal)}</div>
+              <div className="text-muted-foreground">Net payable</div>
+              <div className="text-right font-semibold">{money.format(invoice.totals.netPayable)}</div>
+            </div>
+          </div>
+        </div>
+
+        <div className="overflow-x-auto border-y">
+          <table className="w-full text-sm">
+            <thead className="bg-secondary/60 text-[11px] uppercase tracking-wide text-muted-foreground">
+              <tr>
+                <th className="px-4 py-2 text-left font-medium">Item</th>
+                <th className="px-4 py-2 text-left font-medium">UOM</th>
+                <th className="px-4 py-2 text-right font-medium">Qty</th>
+                <th className="px-4 py-2 text-right font-medium">Free</th>
+                <th className="px-4 py-2 text-right font-medium">Unit price</th>
+                <th className="px-4 py-2 text-right font-medium">Discount</th>
+                <th className="px-4 py-2 text-right font-medium">Tax</th>
+                <th className="px-4 py-2 text-right font-medium">Line total</th>
+              </tr>
+            </thead>
+            <tbody>
+              {invoice.lines.map((line) => (
+                <tr key={line.salesInvoiceLineId} className="border-t border-border">
+                  <td className="px-4 py-3">
+                    <div className="font-medium text-foreground">{line.description}</div>
+                    <div className="text-xs text-muted-foreground">SKU {items.find((i) => i.itemId === line.itemId)?.sku ?? `#${line.itemId}`}</div>
+                  </td>
+                  <td className="px-4 py-3">{uoms.find((u) => u.uomId === line.uomId)?.name ?? `#${line.uomId}`}</td>
+                  <td className="px-4 py-3 text-right">{line.qty.toFixed(0)}</td>
+                  <td className="px-4 py-3 text-right">{line.freeQty > 0 ? line.freeQty.toFixed(0) : "—"}</td>
+                  <td className="px-4 py-3 text-right">{money.format(line.unitPrice)}</td>
+                  <td className="px-4 py-3 text-right">{money.format(line.discountAmount)}</td>
+                  <td className="px-4 py-3 text-right">{money.format(line.taxAmount)}</td>
+                  <td className="px-4 py-3 text-right font-medium">{money.format(line.lineTotal)}</td>
+                </tr>
+              ))}
+            </tbody>
+          </table>
+        </div>
+
+        {invoice.lines.some((line) => line.freeQty > 0) ? (
+          <div className="py-5">
+            <div className="text-sm font-semibold uppercase tracking-wide text-muted-foreground">Free issue summary</div>
+            <div className="mt-3 space-y-2">
+              {invoice.lines.filter((line) => line.freeQty > 0).map((line) => (
+                <div key={line.salesInvoiceLineId} className="flex items-center justify-between text-sm">
+                  <div className="text-foreground">{line.description}</div>
+                  <div className="text-muted-foreground">Free qty: {line.freeQty.toFixed(0)}</div>
+                </div>
+              ))}
+            </div>
+          </div>
+        ) : null}
+
+        {invoice.status === "Draft" && postingCheck && !postingCheck.canPost ? (
+          <div className="border-t pt-5">
+            <div className="rounded-lg border border-amber-200 bg-amber-50 p-4 text-sm text-amber-900">
+              <div className="font-semibold">Stock shortage detected before posting</div>
+              <div className="mt-1 text-sm">The invoice cannot be posted until every line has enough available stock in the selected warehouse.</div>
+              <div className="mt-3 overflow-x-auto">
+                <table className="w-full text-sm">
+                  <thead className="text-left text-xs uppercase tracking-wide text-amber-900/70">
+                    <tr>
+                      <th className="py-1 pr-3">Item</th>
+                      <th className="py-1 pr-3">Warehouse</th>
+                      <th className="py-1 pr-3 text-right">Requested</th>
+                      <th className="py-1 pr-3 text-right">Available</th>
+                      <th className="py-1 text-right">Short</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {postingCheck.issues.map((issue) => (
+                      <tr key={issue.salesInvoiceLineId} className="border-t border-amber-200/60">
+                        <td className="py-2 pr-3">
+                          <div className="font-medium">{issue.itemSku}</div>
+                          <div className="text-xs text-amber-900/70">{issue.itemName}{issue.isFreeIssue ? " · free issue" : ""}</div>
+                        </td>
+                        <td className="py-2 pr-3">{issue.warehouseId}</td>
+                        <td className="py-2 pr-3 text-right font-mono tabular-nums">{issue.requestedQty.toFixed(0)}</td>
+                        <td className="py-2 pr-3 text-right font-mono tabular-nums">{issue.availableQty.toFixed(0)}</td>
+                        <td className="py-2 text-right font-mono tabular-nums">{issue.shortQty.toFixed(0)}</td>
+                      </tr>
+                    ))}
+                  </tbody>
+                </table>
+              </div>
+            </div>
+          </div>
+        ) : null}
+
+        <div className="border-t pt-5">
+          <div className="text-sm font-semibold uppercase tracking-wide text-muted-foreground">Notes</div>
+          <p className="mt-2 text-sm text-muted-foreground">Standard invoice template view.</p>
+        </div>
+
+        <div className="mt-6 border-t pt-5 print:hidden">
+          <div className="mb-3 flex items-center justify-between">
+            <h3 className="text-lg font-semibold">Actions</h3>
+            <span className="text-sm text-muted-foreground">{isDraft ? "Draft invoice can be edited." : "Only draft invoices are editable."}</span>
+          </div>
+
+          {isDraft ? (
+            <>
+              <div className="mb-4 flex flex-wrap gap-2">
+                <button type="button" onClick={addLine} className="inline-flex h-9 items-center gap-2 rounded-full border border-black bg-white px-4 text-sm font-medium shadow-sm hover:bg-muted">
+                  <Plus className="size-4" /> Add line
+                </button>
+                <button type="button" onClick={save} disabled={saving} className="inline-flex h-9 items-center gap-2 rounded-full border border-black bg-white px-4 text-sm font-medium shadow-sm hover:bg-muted disabled:opacity-50">
+                  <Save className="size-4" />
+                  {saving ? "Saving..." : "Save invoice"}
+                </button>
+                <button type="button" onClick={post} disabled={!canPost} className="inline-flex h-9 items-center gap-2 rounded-full bg-black px-4 text-sm font-medium text-white shadow-sm hover:bg-black/90 disabled:cursor-not-allowed disabled:opacity-40">
+                  <Send className="size-4" />
+                  {postingCheck && !postingCheck.canPost ? "Resolve shortages first" : busy === "post" ? "Posting..." : "Post invoice"}
+                </button>
+                <button type="button" onClick={cancel} disabled={busy !== null} className="inline-flex h-9 items-center gap-2 rounded-full border border-rose-300 bg-rose-50 px-4 text-sm font-medium text-rose-700 shadow-sm hover:bg-rose-100 disabled:opacity-50">
+                  <X className="size-4" />
+                  {busy === "cancel" ? "Cancelling..." : "Cancel invoice"}
+                </button>
+              </div>
+
+              <div className="overflow-x-auto border">
+                <table className="w-full text-sm">
+                  <thead className="bg-secondary/60 text-[11px] uppercase tracking-wide text-muted-foreground">
+                    <tr>
+                      <th className="px-4 py-2 text-left font-medium">Item</th>
+                      <th className="px-4 py-2 text-left font-medium">UOM</th>
+                      <th className="px-4 py-2 text-right font-medium">Qty</th>
+                      <th className="px-4 py-2 text-right font-medium">Free</th>
+                      <th className="px-4 py-2 text-right font-medium">Unit price</th>
+                      <th className="px-4 py-2 text-right font-medium">Remove</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {lines.map((line) => (
+                      <tr key={line.key} className="border-t border-border align-middle">
+                        <td className="px-4 py-3 min-w-64">
+                          <select
+                            value={line.itemId ? String(line.itemId) : ""}
+                            onChange={(e) => selectItem(line.key, Number(e.target.value))}
+                            className="h-10 w-full rounded-lg border border-input bg-background px-3 text-sm"
+                          >
+                            <option value="">Select item</option>
+                            {items.map((i) => (
+                              <option key={i.itemId} value={String(i.itemId)}>
+                                {i.sku} - {i.name}
+                              </option>
+                            ))}
+                          </select>
+                        </td>
+                        <td className="px-4 py-3 min-w-40">
+                          <select
+                            value={line.uomId ? String(line.uomId) : ""}
+                            onChange={(e) => updateLine(line.key, { uomId: Number(e.target.value) })}
+                            className="h-10 w-full rounded-lg border border-input bg-background px-3 text-sm"
+                          >
+                            <option value="">UOM</option>
+                            {uoms.map((u) => (
+                              <option key={u.uomId} value={String(u.uomId)}>
+                                {u.name}
+                              </option>
+                            ))}
+                          </select>
+                        </td>
+                        <td className="px-4 py-3 w-28">
+                          <input
+                            type="number"
+                            min="0"
+                            step="1"
+                            value={line.qty}
+                            onChange={(e) => updateLine(line.key, { qty: Number(e.target.value) || 0 })}
+                            className="h-10 w-full rounded-lg border border-input bg-background px-3 text-right font-mono tabular-nums text-sm"
+                          />
+                        </td>
+                        <td className="px-4 py-3 w-28">
+                          <input
+                            type="number"
+                            min="0"
+                            step="1"
+                            value={line.freeQty}
+                            onChange={(e) => updateLine(line.key, { freeQty: Number(e.target.value) || 0 })}
+                            className="h-10 w-full rounded-lg border border-input bg-background px-3 text-right font-mono tabular-nums text-sm"
+                          />
+                        </td>
+                        <td className="px-4 py-3 w-32">
+                          <input
+                            type="number"
+                            min="0"
+                            step="0.01"
+                            value={line.unitPrice ?? ""}
+                            onChange={(e) => updateLine(line.key, { unitPrice: e.target.value === "" ? null : Number(e.target.value) })}
+                            className="h-10 w-full rounded-lg border border-input bg-background px-3 text-right font-mono tabular-nums text-sm"
+                          />
+                        </td>
+                        <td className="px-4 py-3 w-24 text-right">
+                    <button
+                      type="button"
+                      onClick={() => removeLine(line.key)}
+                      disabled={lines.length === 1}
+                            className="inline-flex h-9 w-9 items-center justify-center rounded-full border border-black bg-white text-sm font-medium shadow-sm hover:bg-muted disabled:opacity-50"
+                          >
+                            <Minus className="size-4" />
+                          </button>
+                        </td>
+                      </tr>
+                    ))}
+                  </tbody>
+                </table>
+              </div>
+
+              <div className="mt-5 grid gap-4 md:grid-cols-3">
+                <div className="space-y-1.5">
+                  <Label className="text-xs">Customer</Label>
+                  <select
+                    value={customerId ? String(customerId) : ""}
+                    onChange={(e) => setCustomerId(e.target.value ? Number(e.target.value) : null)}
+                    className="h-10 w-full rounded-lg border border-input bg-background px-3 text-sm"
+                  >
+                    <option value="">Select customer</option>
+                    {customers.map((c) => (
+                      <option key={c.customerId} value={String(c.customerId)}>
+                        {c.customerCode} - {c.displayName ?? c.name}
+                      </option>
+                    ))}
+                  </select>
+                </div>
+                <div className="space-y-1.5">
+                  <Label className="text-xs">Warehouse</Label>
+                  <select
+                    value={warehouseId ? String(warehouseId) : ""}
+                    onChange={(e) => updateHeaderWarehouse(e.target.value ? Number(e.target.value) : null)}
+                    className="h-10 w-full rounded-lg border border-input bg-background px-3 text-sm"
+                  >
+                    <option value="">Select warehouse</option>
+                    {warehouses.map((w) => (
+                      <option key={w.warehouseId} value={String(w.warehouseId)}>
+                        {w.code} - {w.name}
+                      </option>
+                    ))}
+                  </select>
+                </div>
+                <div className="space-y-1.5">
+                  <Label className="text-xs">Invoice type</Label>
+                  <select
+                    value={invoiceType}
+                    onChange={(e) => setInvoiceType(e.target.value as SalesInvoiceType)}
+                    className="h-10 w-full rounded-lg border border-input bg-background px-3 text-sm"
+                  >
+                    <option value="B2B">B2B</option>
+                    <option value="B2C">B2C</option>
+                    <option value="Cash">Cash</option>
+                    <option value="Credit">Credit</option>
+                  </select>
+                </div>
+              </div>
+              <div className="mt-5 flex justify-end">
+                <button
+                  type="button"
+                  onClick={post}
+                  disabled={!canPost}
+                  className="inline-flex h-10 items-center gap-2 rounded-full bg-black px-5 text-sm font-medium text-white shadow-sm hover:bg-black/90 disabled:cursor-not-allowed disabled:opacity-40"
+                >
+                  <Send className="size-4" />
+                  {postingCheck && !postingCheck.canPost ? "Resolve shortages first" : busy === "post" ? "Posting..." : "Post invoice"}
+                </button>
+              </div>
+            </>
+          ) : (
+            <div className="rounded-2xl border border-dashed p-4 text-sm text-muted-foreground">
+              This invoice is {invoice.status.toLowerCase()} and cannot be edited.
+            </div>
+          )}
+        </div>
+      </section>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/sales/invoices/[id]/print/page.tsx b/Frontend/erp-system/app/dashboard/sales/invoices/[id]/print/page.tsx
new file mode 100644
index 0000000..c86302d
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/sales/invoices/[id]/print/page.tsx
@@ -0,0 +1,196 @@
+"use client"
+
+import { useEffect, useMemo, useState } from "react"
+import Link from "next/link"
+import { ArrowLeft, Printer } from "lucide-react"
+
+import { salesApi } from "@/lib/api/sales"
+import { customersApi } from "@/lib/api/customers"
+import { itemsApi } from "@/lib/api/items"
+import { uomsApi } from "@/lib/api/uoms"
+import { warehousesApi } from "@/lib/api/warehouses"
+import { errorMessage } from "@/lib/error-map"
+import { Button, buttonVariants } from "@/components/ui/button"
+import { Skeleton } from "@/components/ui/skeleton"
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+import { cn } from "@/lib/utils"
+import { Customer } from "@/types/customers"
+import { ItemListItem, Uom, Warehouse } from "@/types/master-data"
+import { SalesInvoice } from "@/types/sales"
+
+export default function SalesInvoicePrintPage({ params }: { params: { id: string } }) {
+  const invoiceId = Number(params.id)
+  const [invoice, setInvoice] = useState<SalesInvoice | null>(null)
+  const [customers, setCustomers] = useState<Customer[]>([])
+  const [items, setItems] = useState<ItemListItem[]>([])
+  const [uoms, setUoms] = useState<Uom[]>([])
+  const [warehouses, setWarehouses] = useState<Warehouse[]>([])
+  const [error, setError] = useState<string | null>(null)
+
+  useEffect(() => {
+    if (!Number.isFinite(invoiceId)) {
+      setError(`Invalid invoice id '${params.id}'.`)
+      return
+    }
+    Promise.all([
+      customersApi.list({ pageSize: 200 }),
+      itemsApi.list({ pageSize: 200 }),
+      uomsApi.list({ pageSize: 200 }),
+      warehousesApi.list({ pageSize: 200 }),
+      salesApi.getInvoice(invoiceId),
+    ])
+      .then(([cust, itemRes, uomRes, whRes, doc]) => {
+        setCustomers(cust.items)
+        setItems(itemRes.items)
+        setUoms(uomRes.items)
+        setWarehouses(whRes.items)
+        setInvoice(doc.data)
+      })
+      .catch((err) => setError(errorMessage(err)))
+  }, [params.id, invoiceId])
+
+  const subtotal = useMemo(() => invoice?.totals.subtotal ?? 0, [invoice])
+  const freeQtyTotal = invoice?.totals.freeQtyTotal ?? 0
+
+  if (error && !invoice) {
+    return <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>
+  }
+
+  if (!invoice) {
+    return <div className="rounded-2xl border border-dashed p-8 text-muted-foreground">{error ?? "Invoice print data is loading or unavailable."}</div>
+  }
+
+  const customer = customers.find((c) => c.customerId === invoice.customerId)
+  const warehouse = warehouses.find((w) => w.warehouseId === invoice.warehouseId)
+
+  return (
+    <div className="flex flex-col gap-6 print:block print:gap-0">
+      <div className="flex items-center justify-between gap-3 print:hidden">
+        <div className="flex items-center gap-3">
+          <Link href={`/dashboard/sales/invoices/${invoice.salesInvoiceId}`} className={cn(buttonVariants({ variant: "outline", size: "icon" }))}>
+            <ArrowLeft className="size-4" />
+          </Link>
+          <div>
+            <h1 className="text-2xl font-bold text-foreground">Invoice Print</h1>
+            <p className="text-base text-muted-foreground">{invoice.invoiceNo}</p>
+          </div>
+        </div>
+        <Button variant="outline" onClick={() => window.print()}>
+          <Printer className="size-4" />
+          Print
+        </Button>
+      </div>
+
+      <div className="invoice-sheet rounded-3xl border bg-white p-6 shadow-sm print:rounded-none print:border-0 print:p-0 print:shadow-none">
+        <div className="invoice-header mb-6 grid gap-4 border-b pb-5 md:grid-cols-[1.4fr_1fr]">
+          <div>
+            <div className="text-xs font-semibold uppercase tracking-[0.3em] text-muted-foreground">Sales Invoice</div>
+            <h1 className="mt-2 text-3xl font-semibold text-foreground">{invoice.invoiceNo}</h1>
+            <div className="mt-2 text-sm text-muted-foreground">Status: {invoice.status} · Type: {invoice.invoiceType}</div>
+          </div>
+          <div className="grid gap-2 text-sm md:justify-items-end">
+            <div className="font-semibold text-foreground">ERP Core Trading</div>
+            <div className="text-muted-foreground">Company details are not configured for this print view.</div>
+            <div className="text-muted-foreground">Invoice date: {new Date(invoice.invoiceDate).toLocaleDateString()}</div>
+            <div className="text-muted-foreground">Printed: {new Date().toLocaleString()}</div>
+            <div className="text-muted-foreground">Free qty total: {freeQtyTotal.toFixed(2)}</div>
+          </div>
+        </div>
+
+        <div className="grid gap-4 md:grid-cols-3">
+          <div className="rounded-2xl border bg-muted/20 p-4">
+            <div className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Customer</div>
+            <div className="mt-2 text-lg font-semibold text-foreground">{invoice.customerSnapshotName}</div>
+            <div className="mt-1 text-sm text-muted-foreground">Customer ID: {invoice.customerId}</div>
+            {invoice.customerSnapshotTaxNo ? <div className="mt-1 text-sm text-muted-foreground">Tax No: {invoice.customerSnapshotTaxNo}</div> : null}
+            {customer?.displayName ? <div className="mt-1 text-sm text-muted-foreground">Customer: {customer.displayName}</div> : null}
+          </div>
+          <div className="rounded-2xl border bg-muted/20 p-4">
+            <div className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Warehouse</div>
+            <div className="mt-2 text-lg font-semibold text-foreground">{warehouse?.name ?? `#${invoice.warehouseId}`}</div>
+            <div className="mt-1 text-sm text-muted-foreground">Code: {warehouse?.code ?? invoice.warehouseId}</div>
+          </div>
+          <div className="rounded-2xl border bg-muted/20 p-4">
+            <div className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Totals</div>
+            <div className="mt-2 grid grid-cols-2 gap-2 text-sm">
+              <div className="text-muted-foreground">Subtotal</div><div className="text-right font-medium">{invoice.totals.subtotal.toFixed(2)}</div>
+              <div className="text-muted-foreground">Discount</div><div className="text-right font-medium">{invoice.totals.discountTotal.toFixed(2)}</div>
+              <div className="text-muted-foreground">Free qty</div><div className="text-right font-medium">{freeQtyTotal.toFixed(2)}</div>
+              <div className="text-muted-foreground">Tax</div><div className="text-right font-medium">{invoice.totals.taxTotal.toFixed(2)}</div>
+              <div className="text-muted-foreground">Net payable</div><div className="text-right font-semibold">{invoice.totals.netPayable.toFixed(2)}</div>
+            </div>
+          </div>
+        </div>
+
+        <div className="mt-6 overflow-hidden rounded-2xl border">
+          <Table>
+            <TableHeader>
+              <TableRow>
+                <TableHead className="w-[34%]">Item</TableHead>
+                <TableHead>UOM</TableHead>
+                <TableHead className="text-right">Qty</TableHead>
+                <TableHead className="text-right">Free</TableHead>
+                <TableHead className="text-right">Unit price</TableHead>
+                <TableHead className="text-right">Discount</TableHead>
+                <TableHead className="text-right">Tax</TableHead>
+                <TableHead className="text-right">Line total</TableHead>
+              </TableRow>
+            </TableHeader>
+            <TableBody>
+              {invoice.lines.map((line) => (
+                <TableRow key={line.salesInvoiceLineId}>
+                  <TableCell>
+                    <div className="font-medium text-foreground">{line.description}</div>
+                    <div className="text-xs text-muted-foreground">SKU {items.find((i) => i.itemId === line.itemId)?.sku ?? `#${line.itemId}`}</div>
+                  </TableCell>
+                  <TableCell>{uoms.find((u) => u.uomId === line.uomId)?.name ?? `#${line.uomId}`}</TableCell>
+                  <TableCell className="text-right">{line.qty.toFixed(2)}</TableCell>
+                  <TableCell className="text-right">{line.freeQty > 0 ? line.freeQty.toFixed(2) : "—"}</TableCell>
+                  <TableCell className="text-right">{line.unitPrice.toFixed(2)}</TableCell>
+                  <TableCell className="text-right">{line.discountAmount.toFixed(2)}</TableCell>
+                  <TableCell className="text-right">{line.taxAmount.toFixed(2)}</TableCell>
+                  <TableCell className="text-right font-medium">{line.lineTotal.toFixed(2)}</TableCell>
+                </TableRow>
+              ))}
+            </TableBody>
+          </Table>
+        </div>
+
+        {invoice.lines.some((line) => line.freeQty > 0) ? (
+          <div className="mt-6 rounded-2xl border border-dashed p-4 print:break-inside-avoid">
+            <div className="text-sm font-semibold uppercase tracking-wide text-muted-foreground">Free issue summary</div>
+            <div className="mt-3 grid gap-3 md:grid-cols-2 xl:grid-cols-3">
+              {invoice.lines.filter((line) => line.freeQty > 0).map((line) => (
+                <div key={line.salesInvoiceLineId} className="rounded-xl border bg-emerald-500/5 p-3">
+                  <div className="font-medium text-foreground">{line.description}</div>
+                  <div className="mt-1 text-sm text-muted-foreground">Invoice qty: {line.qty.toFixed(2)}</div>
+                  <div className="mt-1 text-sm text-foreground">Free qty: {line.freeQty.toFixed(2)}</div>
+                </div>
+              ))}
+            </div>
+          </div>
+        ) : null}
+
+        <div className="mt-6 grid gap-4 lg:grid-cols-[1fr_360px]">
+          <div className="rounded-2xl border bg-muted/20 p-4">
+            <div className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Notes</div>
+            <p className="mt-2 text-sm text-muted-foreground">Standard invoice print view.</p>
+          </div>
+          <div className="rounded-2xl border p-4">
+            <div className="text-sm font-semibold uppercase tracking-wide text-muted-foreground">Totals</div>
+            <div className="mt-3 space-y-2 text-sm">
+              <div className="flex justify-between"><span className="text-muted-foreground">Subtotal</span><span>{invoice.totals.subtotal.toFixed(2)}</span></div>
+              <div className="flex justify-between"><span className="text-muted-foreground">Discount total</span><span>{invoice.totals.discountTotal.toFixed(2)}</span></div>
+              <div className="flex justify-between"><span className="text-muted-foreground">Free qty total</span><span>{invoice.totals.freeQtyTotal.toFixed(2)}</span></div>
+              <div className="flex justify-between"><span className="text-muted-foreground">Tax total</span><span>{invoice.totals.taxTotal.toFixed(2)}</span></div>
+              <div className="flex justify-between border-t pt-2 text-base font-semibold"><span>Net payable</span><span>{invoice.totals.netPayable.toFixed(2)}</span></div>
+              <div className="flex justify-between text-muted-foreground"><span>Paid</span><span>{invoice.totals.paidAmount.toFixed(2)}</span></div>
+              <div className="flex justify-between text-muted-foreground"><span>Balance</span><span>{invoice.totals.balanceAmount.toFixed(2)}</span></div>
+            </div>
+          </div>
+        </div>
+
+      </div>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/sales/invoices/new/page.tsx b/Frontend/erp-system/app/dashboard/sales/invoices/new/page.tsx
new file mode 100644
index 0000000..4b84e07
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/sales/invoices/new/page.tsx
@@ -0,0 +1,489 @@
+"use client"
+
+import { useEffect, useMemo, useState } from "react"
+import { useRouter } from "next/navigation"
+import Link from "next/link"
+import { ArrowLeft, Minus, Plus, Save, Trash2 } from "lucide-react"
+
+import { Button, buttonVariants } from "@/components/ui/button"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
+import { Badge } from "@/components/ui/badge"
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+import { cn } from "@/lib/utils"
+import { getSuggestedUnitPrice } from "@/lib/sales-line-utils"
+import { errorMessage } from "@/lib/error-map"
+import { salesApi } from "@/lib/api/sales"
+import { customersApi } from "@/lib/api/customers"
+import { itemsApi } from "@/lib/api/items"
+import { uomsApi } from "@/lib/api/uoms"
+import { warehousesApi } from "@/lib/api/warehouses"
+import { Customer } from "@/types/customers"
+import { ItemListItem, Uom, Warehouse } from "@/types/master-data"
+import { CreateSalesInvoiceLineRequest, CreateSalesInvoiceRequest, SalesInvoiceType } from "@/types/sales"
+import { toast } from "@/components/ui/toast"
+
+type Line = CreateSalesInvoiceLineRequest & { key: string }
+type ActiveFocScheme = {
+  id: number
+  slipNo: string
+  schemeLabel: string
+  warehouseName: string
+  productLabel: string
+}
+
+const blankLine = (key: string): Line => ({
+  key,
+  itemId: 0,
+  uomId: 0,
+  warehouseId: 0,
+  qty: 1,
+  freeQty: 0,
+  unitPrice: null,
+  allowManualPriceOverride: true,
+  discountMode: "Percentage",
+  discountPct: 0,
+  discountAmount: 0,
+  discountValue: 0,
+  taxPct: 0,
+  isFreeIssue: false,
+  parentLineId: null,
+})
+
+const lkr = new Intl.NumberFormat("en-LK", {
+  style: "currency",
+  currency: "LKR",
+  minimumFractionDigits: 2,
+})
+
+export default function NewSalesInvoicePage() {
+  const router = useRouter()
+  const [customers, setCustomers] = useState<Customer[]>([])
+  const [items, setItems] = useState<ItemListItem[]>([])
+  const [uoms, setUoms] = useState<Uom[]>([])
+  const [warehouses, setWarehouses] = useState<Warehouse[]>([])
+  const [customerId, setCustomerId] = useState<number | null>(null)
+  const [warehouseId, setWarehouseId] = useState<number | null>(null)
+  const [invoiceType, setInvoiceType] = useState<SalesInvoiceType>("B2C")
+  const [lines, setLines] = useState<Line[]>([blankLine("line-1")])
+  const [activeFocSchemes, setActiveFocSchemes] = useState<ActiveFocScheme[]>([])
+  const [loading, setLoading] = useState(true)
+  const [submitError, setSubmitError] = useState<string | null>(null)
+  const [saving, setSaving] = useState(false)
+
+  useEffect(() => {
+    Promise.all([
+      customersApi.list({ pageSize: 200 }),
+      itemsApi.list({ pageSize: 200 }),
+      uomsApi.list({ pageSize: 200 }),
+      warehousesApi.list({ pageSize: 200 }),
+      salesApi.listFreeIssues({ pageSize: 20 }),
+    ])
+      .then(([cust, itemRes, uomRes, whRes, freeIssueRes]) => {
+        setCustomers(cust.items)
+        setItems(itemRes.items)
+        setUoms(uomRes.items)
+        setWarehouses(whRes.items)
+        const defaultWarehouseId = whRes.items[0]?.warehouseId ?? null
+        setCustomerId(cust.items[0]?.customerId ?? null)
+        setWarehouseId(defaultWarehouseId)
+        setLines([
+          {
+            ...blankLine("line-1"),
+            itemId: itemRes.items[0]?.itemId ?? 0,
+            uomId: itemRes.items[0]?.baseUomId ?? uomRes.items[0]?.uomId ?? 0,
+            warehouseId: defaultWarehouseId ?? 0,
+            unitPrice: getSuggestedUnitPrice(itemRes.items, itemRes.items[0]?.itemId),
+          },
+        ])
+        setActiveFocSchemes(
+          freeIssueRes.items.flatMap((issue) => {
+            if (!issue.itemId) return []
+            const item = itemRes.items.find((candidate) => candidate.itemId === issue.itemId)
+            const warehouse = whRes.items.find((candidate) => candidate.warehouseId === issue.warehouseId)
+            return [
+              {
+                id: issue.salesSlipId,
+                slipNo: issue.slipNo,
+                schemeLabel: issue.schemeLabel,
+                warehouseName: warehouse?.name ?? `Warehouse ${issue.warehouseId}`,
+                productLabel: `${item?.sku ?? issue.itemSku} - ${item?.name ?? issue.itemName}`,
+              },
+            ]
+          }),
+        )
+      })
+      .catch((err) => setSubmitError(errorMessage(err)))
+      .finally(() => setLoading(false))
+  }, [])
+
+  function updateLine(key: string, patch: Partial<Line>) {
+    setLines((prev) => prev.map((line) => (line.key === key ? { ...line, ...patch } : line)))
+  }
+
+  function updateHeaderWarehouse(nextWarehouseId: number | null) {
+    setWarehouseId(nextWarehouseId)
+    setLines((prev) => prev.map((line) => ({ ...line, warehouseId: nextWarehouseId ?? line.warehouseId })))
+  }
+
+  function selectItem(key: string, itemId: number) {
+    const item = items.find((candidate) => candidate.itemId === itemId)
+    updateLine(key, {
+      itemId,
+      uomId: item?.baseUomId ?? 0,
+      unitPrice: getSuggestedUnitPrice(items, itemId),
+    })
+  }
+
+  function addLine() {
+    setLines((prev) => [
+      ...prev,
+      {
+        ...blankLine(`line-${Date.now()}`),
+        warehouseId: warehouseId ?? 0,
+      },
+    ])
+  }
+
+  function removeLine(key: string) {
+    setLines((prev) => (prev.length === 1 ? prev : prev.filter((line) => line.key !== key)))
+  }
+
+  const grossTotal = useMemo(
+    () => lines.reduce((sum, line) => sum + Number(line.unitPrice ?? 0) * Number(line.qty || 0), 0),
+    [lines],
+  )
+  const discountTotal = useMemo(
+    () =>
+      lines.reduce((sum, line) => {
+        const gross = Number(line.unitPrice ?? 0) * Number(line.qty || 0)
+        const mode = String(line.discountMode)
+        return sum + (mode === "Amount" ? Number(line.discountAmount || 0) : gross * (Number(line.discountPct || 0) / 100))
+      }, 0),
+    [lines],
+  )
+  const taxTotal = useMemo(
+    () =>
+      lines.reduce((sum, line) => {
+        const gross = Number(line.unitPrice ?? 0) * Number(line.qty || 0)
+        const mode = String(line.discountMode)
+        const discount = mode === "Amount" ? Number(line.discountAmount || 0) : gross * (Number(line.discountPct || 0) / 100)
+        const taxable = Math.max(0, gross - discount)
+        return sum + taxable * (Number(line.taxPct || 0) / 100)
+      }, 0),
+    [lines],
+  )
+  const netTotal = Math.max(0, grossTotal - discountTotal)
+  const payableTotal = netTotal + taxTotal
+
+  async function submit() {
+    if (!customerId || !warehouseId) return setSubmitError("Select a customer and warehouse.")
+    if (lines.some((line) => !line.itemId)) return setSubmitError("Select an item for every line.")
+    if (lines.some((line) => !line.warehouseId)) return setSubmitError("Select a warehouse for every line.")
+    if (lines.some((line) => !line.uomId)) return setSubmitError("Select a valid UOM for every line.")
+
+    const payload: CreateSalesInvoiceRequest = {
+      customerId,
+      warehouseId,
+      invoiceType,
+      lines: lines.map((line) => ({
+        itemId: Number(line.itemId),
+        uomId: Number(line.uomId),
+        warehouseId: Number(line.warehouseId),
+        qty: Number(line.qty),
+        freeQty: Number(line.freeQty),
+        unitPrice: line.unitPrice === null ? null : Number(line.unitPrice),
+        allowManualPriceOverride: line.allowManualPriceOverride,
+        discountMode: line.discountMode,
+        discountPct: Number(line.discountPct),
+        discountAmount: Number(line.discountAmount),
+        discountValue: Number(line.discountValue),
+        taxPct: Number(line.taxPct),
+        isFreeIssue: line.isFreeIssue,
+        parentLineId: line.parentLineId || null,
+      })),
+    }
+
+    setSaving(true)
+    setSubmitError(null)
+    try {
+      const created = await salesApi.createInvoice(payload)
+      toast.success("Invoice created", created.data.invoiceNo)
+      router.push(`/dashboard/sales/invoices/${created.data.salesInvoiceId}`)
+    } catch (err) {
+      if (err instanceof Error && "status" in err && (err as { status?: number }).status === 401) {
+        router.push(`/login?next=/dashboard/sales/invoices/new`)
+        return
+      }
+      setSubmitError(errorMessage(err))
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  if (loading) {
+    return <div className="rounded-2xl border border-border bg-card p-8 text-muted-foreground shadow-[var(--shadow-panel)]">Loading masters...</div>
+  }
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+        <div className="flex items-center gap-3">
+          <Link href="/dashboard/sales/invoices" className={cn(buttonVariants({ variant: "outline", size: "icon" }))}>
+            <ArrowLeft className="size-4" />
+          </Link>
+          <div>
+            <h1 className="text-2xl font-bold text-foreground">New invoice</h1>
+            <p className="text-base text-muted-foreground">Select items, set quantity, unit price and line discount.</p>
+          </div>
+        </div>
+        <div className="flex flex-wrap gap-2">
+          <Button type="button" variant="outline" size="sm" onClick={addLine}>
+            <Plus className="size-4" /> Add line
+          </Button>
+          <Button size="sm" onClick={submit} disabled={saving}>
+            <Save className="size-4" /> {saving ? "Saving..." : "Create & open invoice"}
+          </Button>
+        </div>
+      </div>
+
+      {submitError ? <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{submitError}</div> : null}
+
+      <section className="rounded-2xl border border-border bg-card p-4 shadow-[var(--shadow-panel)]">
+        <h2 className="text-sm font-semibold">Invoice header</h2>
+        <div className="mt-3 grid gap-4 sm:grid-cols-2 lg:grid-cols-4">
+          <div className="space-y-1.5">
+            <Label className="text-xs">Customer</Label>
+            <Select value={customerId ? String(customerId) : ""} onValueChange={(v) => setCustomerId(v ? Number(v) : null)}>
+              <SelectTrigger className="h-9 text-sm">
+                <SelectValue placeholder="Select customer" />
+              </SelectTrigger>
+              <SelectContent>
+                {customers.map((c) => (
+                  <SelectItem key={c.customerId} value={String(c.customerId)}>
+                    {c.customerCode} - {c.displayName ?? c.name}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+          </div>
+          <div className="space-y-1.5">
+            <Label className="text-xs">Warehouse</Label>
+            <Select value={warehouseId ? String(warehouseId) : ""} onValueChange={(v) => updateHeaderWarehouse(v ? Number(v) : null)}>
+              <SelectTrigger className="h-9 text-sm">
+                <SelectValue placeholder="Select warehouse" />
+              </SelectTrigger>
+              <SelectContent>
+                {warehouses.map((w) => (
+                  <SelectItem key={w.warehouseId} value={String(w.warehouseId)}>
+                    {w.code} - {w.name}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+          </div>
+          <div className="space-y-1.5">
+            <Label className="text-xs">Invoice type</Label>
+            <Select<SalesInvoiceType> value={invoiceType} onValueChange={(v) => v && setInvoiceType(v)}>
+              <SelectTrigger className="h-9 text-sm">
+                <SelectValue />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem value="B2B">B2B</SelectItem>
+                <SelectItem value="B2C">B2C</SelectItem>
+                <SelectItem value="Cash">Cash</SelectItem>
+                <SelectItem value="Credit">Credit</SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
+          <div className="space-y-1.5">
+            <Label className="text-xs">Invoice summary</Label>
+            <div className="flex h-9 items-center gap-2 rounded-md border border-border bg-secondary/40 px-3 text-xs text-muted-foreground">
+              <Badge variant="outline" className="border-emerald-200 bg-emerald-50 text-emerald-800">
+                Draft
+              </Badge>
+              <span>{lkr.format(payableTotal)}</span>
+            </div>
+          </div>
+        </div>
+      </section>
+
+      <section className="rounded-2xl border border-border bg-card shadow-[var(--shadow-panel)]">
+        <div className="flex items-center justify-between border-b border-border px-4 py-3">
+          <h2 className="text-sm font-semibold">Invoice lines</h2>
+          <Button type="button" variant="outline" size="sm" onClick={addLine}>
+            <Plus className="size-4" /> Add line
+          </Button>
+        </div>
+        <div className="overflow-x-auto">
+          <Table className="text-sm">
+            <TableHeader>
+              <TableRow>
+                <TableHead className="h-12 px-4 text-sm">#</TableHead>
+                <TableHead className="h-12 px-4 text-sm">Item</TableHead>
+                <TableHead className="h-12 px-4 text-sm">UOM</TableHead>
+                <TableHead className="h-12 px-4 text-sm text-right">Qty</TableHead>
+                <TableHead className="h-12 px-4 text-sm text-right">Free</TableHead>
+                <TableHead className="h-12 px-4 text-sm text-right">Unit price</TableHead>
+                <TableHead className="h-12 px-4 text-sm text-right">Discount %</TableHead>
+                <TableHead className="h-12 px-4 text-sm text-right">Line total</TableHead>
+                <TableHead className="h-12 px-4 text-sm" />
+              </TableRow>
+            </TableHeader>
+            <TableBody>
+              {lines.map((line, idx) => {
+                const lineGross = Number(line.unitPrice ?? 0) * Number(line.qty || 0)
+                const lineDiscount =
+                  line.discountMode === "Amount"
+                    ? Number(line.discountAmount || 0)
+                    : lineGross * (Number(line.discountPct || 0) / 100)
+                const lineNet = Math.max(0, lineGross - lineDiscount)
+
+                return (
+                  <TableRow key={line.key} className="align-middle">
+                    <TableCell className="px-4 py-2 text-xs text-muted-foreground">{idx + 1}</TableCell>
+                    <TableCell className="px-4 py-2 min-w-64">
+                      <Select value={line.itemId ? String(line.itemId) : ""} onValueChange={(v) => selectItem(line.key, Number(v))}>
+                        <SelectTrigger className="h-9 text-sm">
+                          <SelectValue placeholder="Select item" />
+                        </SelectTrigger>
+                        <SelectContent>
+                          {items.map((candidate) => (
+                            <SelectItem key={candidate.itemId} value={String(candidate.itemId)}>
+                              {candidate.sku} - {candidate.name}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
+                    </TableCell>
+                    <TableCell className="px-4 py-2 min-w-36">
+                      <Select value={line.uomId ? String(line.uomId) : ""} onValueChange={(v) => updateLine(line.key, { uomId: Number(v) })}>
+                        <SelectTrigger className="h-9 text-sm">
+                          <SelectValue placeholder="UOM" />
+                        </SelectTrigger>
+                        <SelectContent>
+                          {uoms.map((u) => (
+                            <SelectItem key={u.uomId} value={String(u.uomId)}>
+                              {u.name}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
+                    </TableCell>
+                    <TableCell className="px-4 py-2">
+                      <Input
+                        type="number"
+                        min="0"
+                        step="1"
+                        value={line.qty}
+                        onChange={(e) => updateLine(line.key, { qty: Number(e.target.value) })}
+                        className="h-9 w-24 text-right font-mono text-sm tabular-nums"
+                      />
+                    </TableCell>
+                    <TableCell className="px-4 py-2">
+                      <Input
+                        type="number"
+                        min="0"
+                        step="1"
+                        value={line.freeQty}
+                        onChange={(e) => updateLine(line.key, { freeQty: Number(e.target.value) })}
+                        className="h-9 w-24 text-right font-mono text-sm tabular-nums"
+                      />
+                    </TableCell>
+                    <TableCell className="px-4 py-2">
+                      <Input
+                        type="number"
+                        min="0"
+                        step="1"
+                        value={line.unitPrice ?? ""}
+                        onChange={(e) => updateLine(line.key, { unitPrice: e.target.value === "" ? null : Number(e.target.value) })}
+                        className="h-9 w-28 text-right font-mono text-sm tabular-nums"
+                      />
+                    </TableCell>
+                    <TableCell className="px-4 py-2">
+                      <Input
+                        type="number"
+                        min="0"
+                        max="100"
+                        step="0.5"
+                        value={line.discountPct}
+                        onChange={(e) => updateLine(line.key, { discountPct: Number(e.target.value) || 0 })}
+                        className="h-9 w-24 text-right font-mono text-sm tabular-nums"
+                      />
+                    </TableCell>
+                    <TableCell className="px-4 py-2 text-right font-mono font-semibold tabular-nums">{lkr.format(lineNet)}</TableCell>
+                    <TableCell className="px-4 py-2 text-right">
+                      <Button
+                        variant="ghost"
+                        size="icon"
+                        className="size-8 text-muted-foreground"
+                        onClick={() => removeLine(line.key)}
+                        disabled={lines.length === 1}
+                      >
+                        <Trash2 className="size-4" />
+                      </Button>
+                    </TableCell>
+                  </TableRow>
+                )
+              })}
+            </TableBody>
+          </Table>
+        </div>
+      </section>
+
+      <section className="flex justify-end">
+        {/* <div className="rounded-2xl border border-border bg-card p-4 shadow-[var(--shadow-panel)]">
+          <h3 className="text-sm font-semibold">Active FOC schemes</h3>
+          <ul className="mt-3 space-y-2 text-sm">
+            {activeFocSchemes.length > 0 ? (
+              activeFocSchemes.map((scheme) => (
+                <li key={scheme.id} className="rounded-md border border-border px-3 py-2">
+                  <div className="flex items-center justify-between gap-3">
+                    <span className="font-medium">{scheme.schemeLabel}</span>
+                    <span className="text-xs text-muted-foreground">{scheme.slipNo}</span>
+                  </div>
+                  <div className="mt-1 flex flex-wrap items-center justify-between gap-2 text-xs text-muted-foreground">
+                    <span>{scheme.productLabel}</span>
+                    <span>{scheme.warehouseName}</span>
+                  </div>
+                </li>
+              ))
+            ) : (
+              <li className="rounded-md border border-dashed border-border px-3 py-2 text-xs text-muted-foreground">
+                No active free-issue schemes found.
+              </li>
+            )}
+          </ul>
+        </div> */}
+
+        <dl className="w-full max-w-sm rounded-2xl border border-border bg-card p-4 text-sm shadow-[var(--shadow-panel)]">
+          {[
+            ["Gross", lkr.format(grossTotal)],
+            ["Discount", `-${lkr.format(discountTotal)}`],
+            ["Net", lkr.format(netTotal)],
+            ["Tax", lkr.format(taxTotal)],
+          ].map(([k, v]) => (
+            <div key={k} className="flex items-center justify-between py-1.5">
+              <dt className="text-muted-foreground">{k}</dt>
+              <dd className="font-mono tabular-nums">{v}</dd>
+            </div>
+          ))}
+          <div className="mt-2 flex items-center justify-between border-t border-border pt-3">
+            <dt className="font-semibold">Payable</dt>
+            <dd className="font-mono text-base font-semibold tabular-nums">{lkr.format(payableTotal)}</dd>
+          </div>
+        </dl>
+      </section>
+
+      <div className="flex justify-end gap-3">
+        <Link href="/dashboard/sales/invoices" className={cn(buttonVariants({ variant: "outline", size: "lg" }))}>
+          Cancel
+        </Link>
+        <Button size="lg" onClick={submit} disabled={saving}>
+          <Save className="size-4" /> {saving ? "Saving..." : "Save invoice"}
+        </Button>
+      </div>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/sales/invoices/page.tsx b/Frontend/erp-system/app/dashboard/sales/invoices/page.tsx
new file mode 100644
index 0000000..d439ef7
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/sales/invoices/page.tsx
@@ -0,0 +1,239 @@
+"use client"
+
+import { useEffect, useMemo, useState } from "react"
+import Link from "next/link"
+import { ChevronLeft, ChevronRight, Eye, Filter, FileText, Plus, Printer } from "lucide-react"
+
+import { salesApi } from "@/lib/api/sales"
+import { errorMessage } from "@/lib/error-map"
+import { Button, buttonVariants } from "@/components/ui/button"
+import { Badge } from "@/components/ui/badge"
+import { Input } from "@/components/ui/input"
+import { Skeleton } from "@/components/ui/skeleton"
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+import { PaginationMeta } from "@/types/common"
+import { SalesInvoiceStatus, SalesInvoiceSummary } from "@/types/sales"
+import { cn } from "@/lib/utils"
+
+type StatusFilter = SalesInvoiceStatus | "All"
+
+const PAGE_SIZE = 10
+const tabs = ["All", "Draft", "Posted", "Cancelled"] as const
+
+function statusClass(status: SalesInvoiceStatus) {
+  switch (status) {
+    case "Draft":
+      return "border-amber-200 bg-amber-50 text-amber-800"
+    case "Posted":
+      return "border-emerald-200 bg-emerald-50 text-emerald-800"
+    case "Cancelled":
+      return "border-rose-200 bg-rose-50 text-rose-800"
+  }
+}
+
+export default function SalesInvoicesPage() {
+  const [rows, setRows] = useState<SalesInvoiceSummary[] | null>(null)
+  const [pagination, setPagination] = useState<PaginationMeta | null>(null)
+  const [error, setError] = useState<string | null>(null)
+  const [status, setStatus] = useState<StatusFilter>("All")
+  const [searchInput, setSearchInput] = useState("")
+  const [query, setQuery] = useState("")
+  const [page, setPage] = useState(1)
+
+  useEffect(() => {
+    const timeout = setTimeout(() => setQuery(searchInput.trim()), 300)
+    return () => clearTimeout(timeout)
+  }, [searchInput])
+
+  useEffect(() => setPage(1), [query, status])
+
+  useEffect(() => {
+    setError(null)
+    salesApi
+      .listInvoices({ page, pageSize: PAGE_SIZE, status: status === "All" ? undefined : status })
+      .then((res) => {
+        setRows(res.items)
+        setPagination(res.pagination)
+      })
+      .catch((err) => setError(errorMessage(err)))
+  }, [page, status])
+
+  const visibleRows = useMemo(
+    () =>
+      rows?.filter((row) =>
+        `${row.invoiceNo} ${row.customerSnapshotName}`.toLowerCase().includes(query.toLowerCase())
+      ) ?? [],
+    [rows, query]
+  )
+  const hasFilters = status !== "All" || query.length > 0
+  const grossTotal = visibleRows.reduce((sum, row) => sum + row.totals.subtotal, 0)
+  const discountTotal = visibleRows.reduce((sum, row) => sum + row.totals.discountTotal, 0)
+  const netTotal = visibleRows.reduce((sum, row) => sum + row.totals.grandTotal, 0)
+  const printHref = `/print/sales/invoices?status=${encodeURIComponent(status)}&q=${encodeURIComponent(query)}`
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+        <div>
+          <h1 className="text-2xl font-bold text-foreground">Sales Invoices</h1>
+          <p className="text-base text-muted-foreground">Invoice register with filters, posting flow, and settlement tracking.</p>
+        </div>
+        <div className="flex flex-wrap gap-2">
+          <Link
+            href={printHref}
+            target="_blank"
+            rel="noopener noreferrer"
+            className={cn(buttonVariants({ variant: "outline", size: "lg" }))}
+          >
+            <Printer className="size-5" />
+            Print batch
+          </Link>
+          <Link href="/dashboard/sales/invoices/new" className={cn(buttonVariants({ size: "lg" }))}>
+            <Plus className="size-5" />
+            New Invoice
+          </Link>
+        </div>
+      </div>
+
+      <div className="rounded-2xl border bg-card shadow-sm">
+        <div className="flex flex-col gap-3 border-b px-4 py-4 lg:flex-row lg:items-center">
+          <div className="flex flex-wrap gap-2">
+            {tabs.map((t) => (
+              <button
+                key={t}
+                onClick={() => setStatus(t)}
+                className={cn(
+                  "rounded-full border px-3 py-1.5 text-xs font-medium transition-colors",
+                  status === t ? "border-primary bg-primary text-primary-foreground" : "border-border text-muted-foreground hover:text-foreground"
+                )}
+              >
+                {t}
+              </button>
+            ))}
+          </div>
+
+          <div className="flex flex-1 flex-col gap-3 lg:flex-row lg:items-center lg:justify-end">
+            <Input
+              value={searchInput}
+              onChange={(e) => setSearchInput(e.target.value)}
+              placeholder="Filter by customer or invoice number"
+              className="h-12 w-full lg:max-w-sm"
+            />
+            <Button variant="outline" size="sm" className="lg:ml-auto">
+              <Filter className="size-4" />
+              Advanced
+            </Button>
+          </div>
+        </div>
+
+        {error && <div className="mx-4 mt-4 rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>}
+
+        {!error && rows === null && (
+          <div className="flex flex-col gap-3 px-4 py-4">
+            {Array.from({ length: 5 }).map((_, i) => (
+              <Skeleton key={i} className="h-14 w-full" />
+            ))}
+          </div>
+        )}
+
+        {!error && rows !== null && visibleRows.length === 0 && (
+          <div className="flex flex-col items-center gap-4 px-4 py-20 text-center">
+            <FileText className="size-12 text-muted-foreground" />
+            <p className="text-base text-muted-foreground">{hasFilters ? "No invoices match your filters." : "No invoices yet."}</p>
+          </div>
+        )}
+
+        {!error && rows !== null && visibleRows.length > 0 && (
+          <>
+            <div className="overflow-x-auto">
+              <Table className="text-base">
+                <TableHeader>
+                  <TableRow>
+                    <TableHead className="h-12 px-4 text-sm">Invoice</TableHead>
+                    <TableHead className="h-12 px-4 text-sm">Customer</TableHead>
+                    <TableHead className="h-12 px-4 text-sm">Date</TableHead>
+                    <TableHead className="h-12 px-4 text-sm">Due</TableHead>
+                    <TableHead className="h-12 px-4 text-sm text-right">Lines</TableHead>
+                    <TableHead className="h-12 px-4 text-sm text-right">Gross</TableHead>
+                    <TableHead className="h-12 px-4 text-sm text-right">Discount</TableHead>
+                    <TableHead className="h-12 px-4 text-sm text-right">Net</TableHead>
+                    <TableHead className="h-12 px-4 text-sm">Status</TableHead>
+                    <TableHead className="h-12 px-4 text-sm text-right">View</TableHead>
+                  </TableRow>
+                </TableHeader>
+                <TableBody>
+                  {visibleRows.map((row) => (
+                    <TableRow key={row.salesInvoiceId} className="hover:bg-muted/40">
+                      <TableCell className="px-4 py-3.5 font-medium">
+                        <Link href={`/dashboard/sales/invoices/${row.salesInvoiceId}`} className="hover:underline">
+                          {row.invoiceNo}
+                        </Link>
+                      </TableCell>
+                      <TableCell className="px-4 py-3.5">{row.customerSnapshotName}</TableCell>
+                      <TableCell className="px-4 py-3.5 text-muted-foreground">{new Date(row.createdAt).toLocaleDateString()}</TableCell>
+                      <TableCell className="px-4 py-3.5 text-muted-foreground">{new Date(row.invoiceDate).toLocaleDateString()}</TableCell>
+                      <TableCell className="px-4 py-3.5 text-right font-mono tabular-nums">{row.totals.freeQtyTotal.toFixed(2)}</TableCell>
+                      <TableCell className="px-4 py-3.5 text-right font-mono tabular-nums">{row.totals.subtotal.toFixed(2)}</TableCell>
+                      <TableCell className="px-4 py-3.5 text-right font-mono tabular-nums text-muted-foreground">-{row.totals.discountTotal.toFixed(2)}</TableCell>
+                      <TableCell className="px-4 py-3.5 text-right font-mono font-semibold tabular-nums">{row.totals.grandTotal.toFixed(2)}</TableCell>
+                      <TableCell className="px-4 py-3.5">
+                        <Badge variant="outline" className={statusClass(row.status)}>
+                          {row.status}
+                        </Badge>
+                      </TableCell>
+                      <TableCell className="px-4 py-3.5 text-right">
+                        <Link
+                          href={`/dashboard/sales/invoices/${row.salesInvoiceId}`}
+                          className={cn(buttonVariants({ variant: "ghost", size: "icon-sm" }))}
+                          aria-label={`View invoice ${row.invoiceNo}`}
+                        >
+                          <Eye className="size-4" />
+                        </Link>
+                      </TableCell>
+                    </TableRow>
+                  ))}
+                </TableBody>
+              </Table>
+            </div>
+
+            <div className="border-t px-4 py-3">
+              <div className="grid gap-3 text-sm md:grid-cols-3">
+                <div className="rounded-lg border bg-muted/20 px-3 py-2">
+                  <div className="text-muted-foreground">Gross total</div>
+                  <div className="font-mono text-base font-semibold tabular-nums">{grossTotal.toFixed(2)}</div>
+                </div>
+                <div className="rounded-lg border bg-muted/20 px-3 py-2">
+                  <div className="text-muted-foreground">Discount total</div>
+                  <div className="font-mono text-base font-semibold tabular-nums">-{discountTotal.toFixed(2)}</div>
+                </div>
+                <div className="rounded-lg border bg-muted/20 px-3 py-2">
+                  <div className="text-muted-foreground">Net total</div>
+                  <div className="font-mono text-base font-semibold tabular-nums">{netTotal.toFixed(2)}</div>
+                </div>
+              </div>
+            </div>
+
+            {pagination && pagination.totalPages > 1 && (
+              <div className="flex flex-col gap-3 border-t px-4 py-4 sm:flex-row sm:items-center sm:justify-between">
+                <p className="text-sm text-muted-foreground">
+                  Showing {(pagination.page - 1) * pagination.pageSize + 1}-{Math.min(pagination.page * pagination.pageSize, pagination.totalItems)} of {pagination.totalItems}
+                </p>
+                <div className="flex items-center gap-2">
+                  <Button type="button" variant="outline" size="sm" disabled={pagination.page <= 1} onClick={() => setPage((p) => Math.max(1, p - 1))}>
+                    <ChevronLeft />
+                    Previous
+                  </Button>
+                  <span className="text-sm text-muted-foreground">Page {pagination.page} of {pagination.totalPages}</span>
+                  <Button type="button" variant="outline" size="sm" disabled={pagination.page >= pagination.totalPages} onClick={() => setPage((p) => Math.min(pagination.totalPages, p + 1))}>
+                    Next
+                    <ChevronRight />
+                  </Button>
+                </div>
+              </div>
+            )}
+          </>
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/sales/page.tsx b/Frontend/erp-system/app/dashboard/sales/page.tsx
new file mode 100644
index 0000000..ad9c562
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/sales/page.tsx
@@ -0,0 +1,73 @@
+import Link from "next/link"
+import { FileBarChart, FileText, PackageX, ReceiptText, ShoppingCart } from "lucide-react"
+
+import { buttonVariants } from "@/components/ui/button"
+import { cn } from "@/lib/utils"
+
+const sections = [
+  {
+    title: "Invoices",
+    description: "Create and manage sales invoices.",
+    href: "/dashboard/sales/invoices",
+    icon: FileText,
+  },
+  {
+    title: "Slips",
+    description: "Counter-style sales documents.",
+    href: "/dashboard/sales/slips",
+    icon: ShoppingCart,
+  },
+  {
+    title: "Free Issues",
+    description: "Promotional free-issue slips.",
+    href: "/dashboard/sales/free-issues",
+    icon: PackageX,
+  },
+  // {
+  //   title: "Reports",
+  //   description: "Sales report catalog and query entry point.",
+  //   href: "/dashboard/sales/reports",
+  //   icon: FileBarChart,
+  // },
+]
+
+export default function SalesHubPage() {
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex items-start justify-between gap-4">
+        <div>
+          <div className="mb-3 inline-flex items-center gap-2 rounded-full bg-primary/10 px-3 py-1 text-sm font-medium text-primary">
+            <ReceiptText className="size-4" />
+            Sales
+          </div>
+          <h1 className="text-2xl font-bold text-foreground">Sales</h1>
+          <p className="text-base text-muted-foreground">
+            Invoices, slips, and free issues in one place.
+          </p>
+        </div>
+      </div>
+
+      <div className="grid gap-4 md:grid-cols-2 xl:grid-cols-4">
+        {sections.map((section) => {
+          const Icon = section.icon
+          return (
+            <Link
+              key={section.href}
+              href={section.href}
+              className="group rounded-2xl border bg-card p-5 shadow-sm transition-all hover:-translate-y-0.5 hover:shadow-md"
+            >
+              <div className="mb-4 flex size-11 items-center justify-center rounded-2xl bg-primary/10 text-primary">
+                <Icon className="size-5" />
+              </div>
+              <h2 className="text-lg font-semibold text-foreground">{section.title}</h2>
+              <p className="mt-1 text-sm leading-6 text-muted-foreground">{section.description}</p>
+              <div className={cn(buttonVariants({ variant: "ghost", size: "sm" }), "mt-4 px-0 text-primary")}>
+                Open
+              </div>
+            </Link>
+          )
+        })}
+      </div>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/sales/reports/[reportId]/page.tsx b/Frontend/erp-system/app/dashboard/sales/reports/[reportId]/page.tsx
new file mode 100644
index 0000000..3b0677c
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/sales/reports/[reportId]/page.tsx
@@ -0,0 +1,242 @@
+"use client"
+
+import { use, useEffect, useRef, useState } from "react"
+import Link from "next/link"
+import { ArrowLeft, FileBarChart } from "lucide-react"
+
+import { salesApi } from "@/lib/api/sales"
+import { errorMessage } from "@/lib/error-map"
+import { Button, buttonVariants } from "@/components/ui/button"
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
+import { Input } from "@/components/ui/input"
+import { Skeleton } from "@/components/ui/skeleton"
+import { SalesReportDefinition } from "@/types/sales"
+
+function formatHeader(key: string) {
+  return key
+    .replace(/([a-z0-9])([A-Z])/g, "$1 $2")
+    .replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2")
+    .replace(/_/g, " ")
+    .trim()
+}
+
+function formatCell(value: unknown) {
+  if (value === null || value === undefined) return ""
+  if (typeof value === "number") return value.toLocaleString("en-LK", { maximumFractionDigits: 2 })
+  if (typeof value === "string") {
+    const isoDate = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/.test(value) || /^\d{4}-\d{2}-\d{2}$/.test(value)
+    if (isoDate) {
+      const parsed = new Date(value)
+      if (!Number.isNaN(parsed.getTime())) {
+        return new Intl.DateTimeFormat("en-LK", {
+          year: "numeric",
+          month: "short",
+          day: "2-digit",
+        }).format(parsed)
+      }
+    }
+    return value
+  }
+  if (typeof value === "boolean") return value ? "Yes" : "No"
+  if (Array.isArray(value)) return value.map((item) => formatCell(item)).join(", ")
+  if (typeof value === "object") return JSON.stringify(value)
+  return String(value)
+}
+
+const reportColumns: Record<string, string[]> = {
+  "daily-summary": ["date", "invoiceCount", "slipCount", "invoiceSubtotal", "slipSubtotal", "discountTotal", "freeQtyTotal", "taxTotal", "grandTotal"],
+  "item-summary": ["itemId", "itemName", "soldQty", "freeQty", "grossAmount", "discountTotal", "taxTotal", "netAmount"],
+  "customer-summary": ["customerId", "customerName", "invoiceCount", "slipCount", "soldQty", "freeQty", "grossAmount", "discountTotal", "taxTotal", "netAmount"],
+  "warehouse-summary": ["warehouseId", "warehouseName", "invoiceCount", "slipCount", "soldQty", "freeQty", "grossAmount", "discountTotal", "taxTotal", "netAmount"],
+  "discount-summary": ["documentType", "documentNo", "documentDate", "customerName", "subtotal", "discountTotal", "taxTotal", "netAmount"],
+  "free-issue-summary": ["documentType", "documentNo", "documentDate", "customerName", "itemId", "itemName", "freeQty", "freeValue", "warehouseId", "warehouseName"],
+}
+
+export default function SalesReportDetailPage({ params }: { params: Promise<{ reportId: string }> }) {
+  const resolvedParams = use(params)
+  const [report, setReport] = useState<SalesReportDefinition | null>(null)
+  const [error, setError] = useState<string | null>(null)
+  const [loading, setLoading] = useState(true)
+  const [from, setFrom] = useState("")
+  const [to, setTo] = useState("")
+  const [queryLoading, setQueryLoading] = useState(false)
+  const [rows, setRows] = useState<unknown[] | null>(null)
+  const [queryError, setQueryError] = useState<string | null>(null)
+  const lastAutoRunKey = useRef<string>("")
+
+  useEffect(() => {
+    setError(null)
+    setLoading(true)
+    salesApi.getReport(resolvedParams.reportId)
+      .then(setReport)
+      .catch((err) => setError(errorMessage(err)))
+      .finally(() => setLoading(false))
+  }, [resolvedParams.reportId])
+
+  useEffect(() => {
+    const now = new Date()
+    const firstDay = new Date(now.getFullYear(), now.getMonth(), 1)
+    setFrom(firstDay.toISOString().slice(0, 10))
+    setTo(now.toISOString().slice(0, 10))
+  }, [resolvedParams.reportId])
+
+  useEffect(() => {
+    if (!report || !from || !to) return
+
+    const runKey = `${report.id}:${from}:${to}`
+    if (lastAutoRunKey.current === runKey) return
+
+    lastAutoRunKey.current = runKey
+    setQueryError(null)
+    setQueryLoading(true)
+    salesApi
+      .queryReport({
+        reportType: report.id,
+        from,
+        to,
+      })
+      .then((response) => setRows(response.rows))
+      .catch((err) => {
+        setRows(null)
+        setQueryError(errorMessage(err))
+      })
+      .finally(() => setQueryLoading(false))
+  }, [report, from, to])
+
+  const runReport = () => {
+    if (!report) return
+    if (!from || !to) {
+      setQueryError("Select both from and to dates.")
+      setRows(null)
+      return
+    }
+
+    lastAutoRunKey.current = `${report.id}:${from}:${to}`
+    setQueryError(null)
+    setQueryLoading(true)
+    salesApi
+      .queryReport({
+        reportType: report.id,
+        from,
+        to,
+      })
+      .then((response) => setRows(response.rows))
+      .catch((err) => {
+        setRows(null)
+        setQueryError(errorMessage(err))
+      })
+      .finally(() => setQueryLoading(false))
+  }
+
+  const columns = report ? (reportColumns[report.id] ?? (rows && rows.length > 0 ? Object.keys(rows[0] as Record<string, unknown>) : [])) : []
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex items-center gap-3">
+        <Link href="/dashboard/sales/reports" className={buttonVariants({ variant: "outline", size: "icon" })}>
+          <ArrowLeft className="size-4" />
+        </Link>
+        <div>
+          <h1 className="text-2xl font-bold text-foreground">Report Details</h1>
+          <p className="text-base text-muted-foreground">Metadata for the selected sales report.</p>
+        </div>
+      </div>
+
+      {error && <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>}
+
+      {!error && loading && <Skeleton className="h-48 rounded-2xl" />}
+
+      {!error && !loading && report === null && (
+        <div className="rounded-2xl border border-dashed p-8 text-base text-muted-foreground">
+          Report metadata could not be loaded. The report id may be invalid, or your session may have expired.
+        </div>
+      )}
+
+      {!error && report && (
+        <div className="space-y-4">
+          <Card>
+            <CardHeader>
+              <div className="flex items-center gap-3">
+                <div className="flex size-11 items-center justify-center rounded-xl bg-primary/10 text-primary">
+                  <FileBarChart className="size-5" />
+                </div>
+                <div>
+                  <CardTitle className="text-lg">{report.name}</CardTitle>
+                  <p className="mt-1 text-sm text-muted-foreground">{report.id}</p>
+                </div>
+              </div>
+            </CardHeader>
+            <CardContent>
+              <p className="text-base text-muted-foreground">{report.description}</p>
+            </CardContent>
+          </Card>
+
+          {resolvedParams.reportId !== "daily-summary" && (
+          <Card>
+            <CardContent className="grid gap-4 p-4 sm:grid-cols-2 lg:grid-cols-3">
+              <div className="space-y-2">
+                <label className="text-sm font-medium text-foreground">From</label>
+                <Input type="date" value={from} onChange={(e) => setFrom(e.target.value)} />
+                </div>
+                <div className="space-y-2">
+                  <label className="text-sm font-medium text-foreground">To</label>
+                  <Input type="date" value={to} onChange={(e) => setTo(e.target.value)} />
+              </div>
+              <div className="flex items-end">
+                <Button type="button" className="w-full sm:w-auto" onClick={runReport} disabled={queryLoading}>
+                  Run report
+                </Button>
+                </div>
+              </CardContent>
+            </Card>
+          )}
+
+          {queryError && <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{queryError}</div>}
+
+          {queryLoading && <Skeleton className="h-40 rounded-2xl" />}
+
+          {!queryLoading && rows && rows.length === 0 && (
+            <div className="rounded-lg border border-dashed p-8 text-sm text-muted-foreground">
+              No rows returned for the selected date range.
+            </div>
+          )}
+
+          {!queryLoading && rows && rows.length > 0 && (
+            <Card>
+              <CardHeader>
+                <CardTitle className="text-base">Report Results</CardTitle>
+              </CardHeader>
+              <CardContent className="overflow-x-auto">
+                <table className="w-full text-sm">
+                  <thead className="bg-secondary/60 text-[11px] uppercase tracking-wide text-muted-foreground">
+                    <tr>
+                      {columns.map((key) => (
+                        <th key={key} className="px-4 py-2 text-left font-medium">
+                          {formatHeader(key)}
+                        </th>
+                      ))}
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {rows.map((row, index) => {
+                      const record = row as Record<string, unknown>
+                      return (
+                        <tr key={index} className="border-t border-border hover:bg-secondary/40">
+                          {columns.map((key) => (
+                            <td key={key} className="px-4 py-2.5 align-top">
+                              {formatCell(record[key])}
+                            </td>
+                          ))}
+                        </tr>
+                      )
+                    })}
+                  </tbody>
+                </table>
+              </CardContent>
+            </Card>
+          )}
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/sales/reports/page.tsx b/Frontend/erp-system/app/dashboard/sales/reports/page.tsx
new file mode 100644
index 0000000..3a6797f
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/sales/reports/page.tsx
@@ -0,0 +1,81 @@
+"use client"
+
+import { useEffect, useState } from "react"
+import Link from "next/link"
+import { BarChart3, CalendarRange, FileBarChart, ShoppingCart, type LucideIcon } from "lucide-react"
+
+import { salesApi } from "@/lib/api/sales"
+import { errorMessage } from "@/lib/error-map"
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
+import { Skeleton } from "@/components/ui/skeleton"
+import { SalesReportDefinition } from "@/types/sales"
+
+const reportIcons: Record<string, LucideIcon> = {
+  sales: BarChart3,
+  invoice: FileBarChart,
+  product: ShoppingCart,
+  period: CalendarRange,
+}
+
+export default function SalesReportsPage() {
+  const [reports, setReports] = useState<SalesReportDefinition[] | null>(null)
+  const [error, setError] = useState<string | null>(null)
+
+  useEffect(() => {
+    setError(null)
+    salesApi.listReports().then(setReports).catch((err) => setError(errorMessage(err)))
+  }, [])
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div>
+        <h1 className="text-2xl font-bold text-foreground">Sales Reports</h1>
+        <p className="text-base text-muted-foreground">
+          Card-based report hub with the same layout and handling style used across stock management.
+        </p>
+      </div>
+
+      {error && <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>}
+
+      {!error && reports === null && (
+        <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 xl:grid-cols-3">
+          {Array.from({ length: 6 }).map((_, i) => (
+            <Skeleton key={i} className="h-40 rounded-xl" />
+          ))}
+        </div>
+      )}
+
+      {!error && reports && reports.length === 0 && (
+        <div className="flex flex-col items-center gap-4 rounded-xl border border-dashed py-20 text-center">
+          <FileBarChart className="size-12 text-muted-foreground" />
+          <p className="text-base text-muted-foreground">No sales reports are available.</p>
+        </div>
+      )}
+
+      {!error && reports && reports.length > 0 && (
+        <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 xl:grid-cols-3">
+          {reports.map((report) => (
+            <Link key={report.id} href={`/dashboard/sales/reports/${report.id}`}>
+              <Card className="h-full transition-shadow group-hover:shadow-md">
+                <CardHeader>
+                  <div className="flex items-center gap-3">
+                    <div className="flex size-11 shrink-0 items-center justify-center rounded-xl bg-primary/10 text-primary">
+                      {(() => {
+                        const Icon = reportIcons[report.id.toLowerCase()] ?? FileBarChart
+                        return <Icon className="size-5" />
+                      })()}
+                    </div>
+                    <CardTitle className="text-lg">{report.name}</CardTitle>
+                  </div>
+                </CardHeader>
+                <CardContent>
+                  <p className="text-base text-muted-foreground">{report.description}</p>
+                </CardContent>
+              </Card>
+            </Link>
+          ))}
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/sales/slips/[id]/page.tsx b/Frontend/erp-system/app/dashboard/sales/slips/[id]/page.tsx
new file mode 100644
index 0000000..9a50c88
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/sales/slips/[id]/page.tsx
@@ -0,0 +1,465 @@
+"use client"
+
+import { use, useEffect, useMemo, useState } from "react"
+import Link from "next/link"
+import { ArrowLeft, Minus, Plus, Printer, Save, Send, X } from "lucide-react"
+
+import { salesApi } from "@/lib/api/sales"
+import { customersApi } from "@/lib/api/customers"
+import { itemsApi } from "@/lib/api/items"
+import { uomsApi } from "@/lib/api/uoms"
+import { warehousesApi } from "@/lib/api/warehouses"
+import { usersApi } from "@/lib/api/users"
+import { errorMessage } from "@/lib/error-map"
+import { Button, buttonVariants } from "@/components/ui/button"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
+import { Skeleton } from "@/components/ui/skeleton"
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+import { cn } from "@/lib/utils"
+import { getSuggestedUnitPrice } from "@/lib/sales-line-utils"
+import { FreeIssuePromotionSuggestions } from "@/components/sales/FreeIssuePromotionSuggestions"
+import { Customer } from "@/types/customers"
+import { ItemListItem, Uom, Warehouse } from "@/types/master-data"
+import { ManagedUser } from "@/types/users"
+import { CreateSalesSlipLineRequest, SalesFreeIssueSuggestion, SalesSlip, SalesSlipPostingCheck } from "@/types/sales"
+import { toast } from "@/components/ui/toast"
+
+type Line = CreateSalesSlipLineRequest & { key: string }
+
+const money = new Intl.NumberFormat("en-LK", {
+  style: "currency",
+  currency: "LKR",
+  minimumFractionDigits: 2,
+})
+
+const blankLine = (key: string): Line => ({
+  key,
+  itemId: 0,
+  uomId: 0,
+  warehouseId: 0,
+  qty: 1,
+  freeQty: 0,
+  unitPrice: null,
+  allowManualPriceOverride: true,
+  discountMode: "Percentage",
+  discountPct: 0,
+  discountAmount: 0,
+  discountValue: 0,
+  taxPct: 0,
+  isFreeIssue: false,
+  parentLineId: null,
+})
+
+export default function SalesSlipDetailPage({ params }: { params: Promise<{ id: string }> }) {
+  const resolvedParams = use(params)
+  const slipId = Number(resolvedParams.id)
+  const [slip, setSlip] = useState<SalesSlip | null>(null)
+  const [etag, setEtag] = useState<string | null>(null)
+  const [customers, setCustomers] = useState<Customer[]>([])
+  const [items, setItems] = useState<ItemListItem[]>([])
+  const [uoms, setUoms] = useState<Uom[]>([])
+  const [warehouses, setWarehouses] = useState<Warehouse[]>([])
+  const [users, setUsers] = useState<ManagedUser[]>([])
+  const [promotionSuggestion, setPromotionSuggestion] = useState<SalesFreeIssueSuggestion | null>(null)
+  const [postingCheck, setPostingCheck] = useState<SalesSlipPostingCheck | null>(null)
+  const [customerId, setCustomerId] = useState<number | null>(null)
+  const [warehouseId, setWarehouseId] = useState<number | null>(null)
+  const [cashierUserId, setCashierUserId] = useState<number | null>(null)
+  const [lines, setLines] = useState<Line[]>([blankLine("line-1")])
+  const [error, setError] = useState<string | null>(null)
+  const [saving, setSaving] = useState(false)
+  const [actionBusy, setActionBusy] = useState<"post" | "cancel" | null>(null)
+
+  useEffect(() => {
+    if (!Number.isFinite(slipId)) {
+      setError(`Invalid slip id '${resolvedParams.id}'.`)
+      return
+    }
+    Promise.all([
+      customersApi.list({ pageSize: 200 }),
+      itemsApi.list({ pageSize: 200 }),
+      uomsApi.list({ pageSize: 200 }),
+      warehousesApi.list({ pageSize: 200 }),
+      usersApi.list({ pageSize: 200 }),
+      salesApi.getSlip(slipId),
+    ])
+      .then(([cust, itemRes, uomRes, whRes, userRes, doc]) => {
+        setCustomers(cust.items)
+        setItems(itemRes.items)
+        setUoms(uomRes.items)
+        setWarehouses(whRes.items)
+        setUsers(userRes.items)
+        setSlip(doc.data)
+        setEtag(doc.etag)
+        setCustomerId(doc.data.customerId)
+        setWarehouseId(doc.data.warehouseId)
+        setCashierUserId(doc.data.cashierUserId)
+        setPromotionSuggestion(null)
+        setLines(
+          doc.data.lines.map((line) => ({
+            key: String(line.salesSlipLineId),
+            itemId: line.itemId,
+            uomId: line.uomId,
+            warehouseId: line.warehouseId,
+            qty: line.qty,
+            freeQty: line.freeQty,
+            unitPrice: line.unitPrice,
+            allowManualPriceOverride: true,
+            discountMode: line.discountMode,
+            discountPct: line.discountPct,
+            discountAmount: line.discountAmount,
+            discountValue: 0,
+            taxPct: line.taxPct,
+            isFreeIssue: line.isFreeIssue,
+            parentLineId: line.parentLineId,
+          }))
+        )
+      })
+      .then(async () => {
+        try {
+          const suggestions = await salesApi.getFreeIssueSuggestions(slipId)
+          setPromotionSuggestion(suggestions)
+        } catch {
+          setPromotionSuggestion(null)
+        }
+      })
+      .catch((err) => setError(errorMessage(err)))
+  }, [resolvedParams.id, slipId])
+
+  useEffect(() => {
+    if (!slip || slip.status !== "Draft") {
+      setPostingCheck(null)
+      return
+    }
+    salesApi
+      .checkSlipPosting(slipId)
+      .then((result) => setPostingCheck(result))
+      .catch(() => setPostingCheck(null))
+  }, [slip, slipId])
+
+  const subtotal = useMemo(
+    () => lines.reduce((sum, line) => sum + Number(line.qty || 0) * Number(line.unitPrice ?? 0), 0),
+    [lines]
+  )
+
+  function updateLine(key: string, patch: Partial<Line>) {
+    setLines((prev) => prev.map((line) => (line.key === key ? { ...line, ...patch } : line)))
+  }
+
+  function selectItem(key: string, itemId: number) {
+    updateLine(key, {
+      itemId,
+      unitPrice: getSuggestedUnitPrice(items, itemId),
+    })
+  }
+
+  function addLine() {
+    setLines((prev) => [...prev, blankLine(`line-${Date.now()}`)])
+  }
+
+  function removeLine(key: string) {
+    setLines((prev) => (prev.length === 1 ? prev : prev.filter((line) => line.key !== key)))
+  }
+
+  async function save() {
+    if (!customerId || !warehouseId || !cashierUserId || !etag) return
+    setSaving(true)
+    setError(null)
+    try {
+      const payload = {
+        customerId,
+        warehouseId,
+        cashierUserId,
+        lines: lines.map((line) => ({
+          itemId: Number(line.itemId),
+          uomId: Number(line.uomId),
+          warehouseId: Number(line.warehouseId),
+          qty: Number(line.qty),
+          freeQty: Number(line.freeQty),
+          unitPrice: line.unitPrice === null ? null : Number(line.unitPrice),
+          allowManualPriceOverride: line.allowManualPriceOverride,
+          discountMode: line.discountMode,
+          discountPct: Number(line.discountPct),
+          discountAmount: Number(line.discountAmount),
+          discountValue: Number(line.discountValue),
+          taxPct: Number(line.taxPct),
+          isFreeIssue: line.isFreeIssue,
+          parentLineId: line.parentLineId || null,
+        })),
+      }
+      const updated = await salesApi.updateSlip(slipId, payload, etag)
+      setSlip(updated.data)
+      setEtag(updated.etag)
+      toast.success("Slip saved", updated.data.slipNo)
+    } catch (err) {
+      setError(errorMessage(err))
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  async function post() {
+    if (!postingCheck?.canPost) {
+      setError("Resolve stock shortages before posting this slip.")
+      return
+    }
+    setActionBusy("post")
+    setError(null)
+    try {
+      const posted = await salesApi.postSlip(slipId)
+      setSlip(posted)
+      toast.success("Slip posted", posted.slipNo)
+    } catch (err) {
+      setError(errorMessage(err))
+    } finally {
+      setActionBusy(null)
+    }
+  }
+
+  async function cancel() {
+    setActionBusy("cancel")
+    setError(null)
+    try {
+      const cancelled = await salesApi.cancelSlip(slipId)
+      setSlip(cancelled)
+      toast.success("Slip cancelled", cancelled.slipNo)
+    } catch (err) {
+      setError(errorMessage(err))
+    } finally {
+      setActionBusy(null)
+    }
+  }
+
+  if (error && !slip) return <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>
+  if (!slip) return <div className="rounded-2xl border border-dashed p-8 text-muted-foreground">{error ?? "Slip data is loading or unavailable."}</div>
+
+  const locked = slip.status !== "Draft"
+  const canPost = slip.status === "Draft" && (postingCheck?.canPost ?? true) && actionBusy === null
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex items-center justify-between gap-3">
+        <div className="flex items-center gap-3">
+          <Link href="/dashboard/sales/slips" className={cn(buttonVariants({ variant: "outline", size: "icon" }))}>
+            <ArrowLeft className="size-4" />
+          </Link>
+          <div>
+            <h1 className="text-2xl font-bold text-foreground">Sales Slip</h1>
+            <p className="text-base text-muted-foreground">{slip.slipNo} · {slip.status}</p>
+          </div>
+        </div>
+        <div className="flex flex-wrap gap-2">
+          <Link
+            href={`/print/sales/slips/${slip.salesSlipId}`}
+            target="_blank"
+            rel="noopener noreferrer"
+            className={cn(buttonVariants({ variant: "outline", size: "default" }))}
+          >
+            <Printer className="size-4" />
+            Print
+          </Link>
+          <Button variant="outline" onClick={save} disabled={saving || locked}><Save className="size-4" />{saving ? "Saving..." : "Save"}</Button>
+          <Button variant="outline" onClick={post} disabled={!canPost}><Send className="size-4" />{postingCheck && !postingCheck.canPost ? "Resolve shortages first" : actionBusy === "post" ? "Posting..." : "Post"}</Button>
+          <Button variant="destructive" onClick={cancel} disabled={actionBusy !== null || locked}><X className="size-4" />{actionBusy === "cancel" ? "Cancelling..." : "Cancel"}</Button>
+        </div>
+      </div>
+
+      {error && <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>}
+
+      <section className="bg-white">
+        <div className="border-b pb-4">
+          <div className="flex flex-col gap-3 md:flex-row md:items-start md:justify-between">
+            <div>
+              <div className="text-xs font-semibold uppercase tracking-[0.35em] text-muted-foreground">Sales Slip</div>
+              <h2 className="mt-2 text-3xl font-semibold text-foreground">{slip.slipNo}</h2>
+              <div className="mt-1 flex flex-wrap items-center gap-2 text-sm text-muted-foreground">
+                <span>Status:</span>
+                <span className={cn("inline-flex rounded-full border px-2 py-0.5 text-xs font-medium", slip.status === "Draft" ? "border-amber-200 bg-amber-50 text-amber-800" : slip.status === "Posted" ? "border-emerald-200 bg-emerald-50 text-emerald-800" : "border-rose-200 bg-rose-50 text-rose-800")}>
+                  {slip.status}
+                </span>
+                <span>Date: {new Date(slip.slipDate).toLocaleDateString()}</span>
+                <span>Cashier: {users.find((u) => u.userId === slip.cashierUserId)?.displayName ?? `#${slip.cashierUserId}`}</span>
+              </div>
+            </div>
+            <div className="text-sm md:text-right">
+              <div className="font-semibold text-foreground">{customers.find((c) => c.customerId === slip.customerId)?.displayName ?? customers.find((c) => c.customerId === slip.customerId)?.name ?? slip.customerSnapshotName}</div>
+              <div className="text-muted-foreground">Warehouse: {warehouses.find((w) => w.warehouseId === slip.warehouseId)?.name ?? `#${slip.warehouseId}`}</div>
+              <div className="text-muted-foreground">Code: {warehouses.find((w) => w.warehouseId === slip.warehouseId)?.code ?? slip.warehouseId}</div>
+            </div>
+          </div>
+        </div>
+
+        <div className="grid gap-6 py-5 md:grid-cols-3">
+          <div>
+            <div className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Customer</div>
+            <div className="mt-2 font-semibold text-foreground">{slip.customerSnapshotName}</div>
+            <div className="text-sm text-muted-foreground">Customer ID: {slip.customerId}</div>
+          </div>
+          <div>
+            <div className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Warehouse</div>
+            <div className="mt-2 font-semibold text-foreground">{warehouses.find((w) => w.warehouseId === slip.warehouseId)?.name ?? `#${slip.warehouseId}`}</div>
+            <div className="text-sm text-muted-foreground">Code: {warehouses.find((w) => w.warehouseId === slip.warehouseId)?.code ?? slip.warehouseId}</div>
+          </div>
+          <div>
+            <div className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Totals</div>
+            <div className="mt-2 grid grid-cols-2 gap-2 text-sm">
+              <div className="text-muted-foreground">Subtotal</div>
+              <div className="text-right font-medium">{money.format(slip.totals.subtotal)}</div>
+              <div className="text-muted-foreground">Discount</div>
+              <div className="text-right font-medium">{money.format(slip.totals.discountTotal)}</div>
+              <div className="text-muted-foreground">Free qty</div>
+              <div className="text-right font-medium">{slip.totals.freeQtyTotal.toFixed(0)}</div>
+              <div className="text-muted-foreground">Grand total</div>
+              <div className="text-right font-semibold">{money.format(slip.totals.grandTotal)}</div>
+            </div>
+          </div>
+        </div>
+
+        <div className="overflow-x-auto border-y">
+          <Table className="text-sm">
+            <TableHeader>
+              <TableRow>
+                <TableHead className="h-12 px-4 text-sm">Item</TableHead>
+                <TableHead className="h-12 px-4 text-sm">UOM</TableHead>
+                <TableHead className="h-12 px-4 text-sm text-right">Qty</TableHead>
+                <TableHead className="h-12 px-4 text-sm text-right">Free</TableHead>
+                <TableHead className="h-12 px-4 text-sm text-right">Unit price</TableHead>
+                <TableHead className="h-12 px-4 text-sm text-right">Line total</TableHead>
+              </TableRow>
+            </TableHeader>
+            <TableBody>
+              {slip.lines.map((line) => (
+                <TableRow key={line.salesSlipLineId}>
+                  <TableCell className="px-4 py-3">
+                    <div className="font-medium text-foreground">{line.description}</div>
+                    <div className="text-xs text-muted-foreground">SKU {items.find((i) => i.itemId === line.itemId)?.sku ?? `#${line.itemId}`}</div>
+                  </TableCell>
+                  <TableCell className="px-4 py-3">{uoms.find((u) => u.uomId === line.uomId)?.name ?? `#${line.uomId}`}</TableCell>
+                  <TableCell className="px-4 py-3 text-right">{line.qty.toFixed(0)}</TableCell>
+                  <TableCell className="px-4 py-3 text-right">{line.freeQty > 0 ? line.freeQty.toFixed(0) : "—"}</TableCell>
+                  <TableCell className="px-4 py-3 text-right">{money.format(line.unitPrice)}</TableCell>
+                  <TableCell className="px-4 py-3 text-right font-medium">{money.format(line.lineTotal)}</TableCell>
+                </TableRow>
+              ))}
+            </TableBody>
+          </Table>
+        </div>
+      </section>
+
+      {slip.status === "Draft" && postingCheck && !postingCheck.canPost ? (
+        <div className="rounded-lg border border-amber-200 bg-amber-50 p-4 text-sm text-amber-900">
+          <div className="font-semibold">Stock shortage detected before posting</div>
+          <div className="mt-1">This slip cannot be posted until every line has enough available stock in the selected warehouse.</div>
+          <div className="mt-3 overflow-x-auto">
+            <table className="w-full text-sm">
+              <thead className="text-left text-xs uppercase tracking-wide text-amber-900/70">
+                <tr>
+                  <th className="py-1 pr-3">Item</th>
+                  <th className="py-1 pr-3">Warehouse</th>
+                  <th className="py-1 pr-3 text-right">Requested</th>
+                  <th className="py-1 pr-3 text-right">Available</th>
+                  <th className="py-1 text-right">Short</th>
+                </tr>
+              </thead>
+              <tbody>
+                {postingCheck.issues.map((issue) => (
+                  <tr key={issue.salesSlipLineId} className="border-t border-amber-200/60">
+                    <td className="py-2 pr-3">
+                      <div className="font-medium">{issue.itemSku}</div>
+                      <div className="text-xs text-amber-900/70">{issue.itemName}{issue.isFreeIssue ? " · free issue" : ""}</div>
+                    </td>
+                    <td className="py-2 pr-3">{issue.warehouseId}</td>
+                    <td className="py-2 pr-3 text-right font-mono tabular-nums">{issue.requestedQty.toFixed(0)}</td>
+                    <td className="py-2 pr-3 text-right font-mono tabular-nums">{issue.availableQty.toFixed(0)}</td>
+                    <td className="py-2 text-right font-mono tabular-nums">{issue.shortQty.toFixed(0)}</td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          </div>
+        </div>
+      ) : null}
+
+      {slip.status === "Draft" ? (
+        <>
+          <div className="grid gap-4 md:grid-cols-3">
+            <div className="flex flex-col gap-2">
+              <Label>Customer</Label>
+              <Select value={customerId ? String(customerId) : ""} onValueChange={(v) => setCustomerId(v ? Number(v) : null)} disabled={locked}>
+                <SelectTrigger className="h-12!"><SelectValue /></SelectTrigger>
+                <SelectContent>{customers.map((c) => <SelectItem key={c.customerId} value={String(c.customerId)}>{c.customerCode} - {c.displayName ?? c.name}</SelectItem>)}</SelectContent>
+              </Select>
+            </div>
+            <div className="flex flex-col gap-2">
+              <Label>Warehouse</Label>
+              <Select value={warehouseId ? String(warehouseId) : ""} onValueChange={(v) => setWarehouseId(v ? Number(v) : null)} disabled={locked}>
+                <SelectTrigger className="h-12!"><SelectValue /></SelectTrigger>
+                <SelectContent>{warehouses.map((w) => <SelectItem key={w.warehouseId} value={String(w.warehouseId)}>{w.code} - {w.name}</SelectItem>)}</SelectContent>
+              </Select>
+            </div>
+            <div className="flex flex-col gap-2">
+              <Label>Cashier</Label>
+              <Select value={cashierUserId ? String(cashierUserId) : ""} onValueChange={(v) => setCashierUserId(v ? Number(v) : null)} disabled={locked}>
+                <SelectTrigger className="h-12!"><SelectValue /></SelectTrigger>
+                <SelectContent>{users.map((u) => <SelectItem key={u.userId} value={String(u.userId)}>{u.displayName}</SelectItem>)}</SelectContent>
+              </Select>
+            </div>
+          </div>
+
+          <div className="rounded-2xl border p-4">
+            <div className="mb-3 flex items-center justify-between">
+              <h2 className="text-lg font-semibold">Lines</h2>
+              <Button type="button" variant="outline" onClick={addLine} disabled={locked}><Plus className="size-4" /> Add line</Button>
+            </div>
+            <Table>
+              <TableHeader>
+                <TableRow>
+                  <TableHead>Item</TableHead>
+                  <TableHead>UOM</TableHead>
+                  <TableHead>Qty</TableHead>
+                  <TableHead>Free</TableHead>
+                  <TableHead>Unit price</TableHead>
+                  <TableHead />
+                </TableRow>
+              </TableHeader>
+              <TableBody>
+                {lines.map((line) => (
+                  <TableRow key={line.key}>
+                    <TableCell>
+                      <Select value={line.itemId ? String(line.itemId) : ""} onValueChange={(v) => selectItem(line.key, Number(v))} disabled={locked}>
+                        <SelectTrigger className="h-11!"><SelectValue placeholder="Item" /></SelectTrigger>
+                        <SelectContent>{items.map((i) => <SelectItem key={i.itemId} value={String(i.itemId)}>{i.sku} - {i.name}</SelectItem>)}</SelectContent>
+                      </Select>
+                    </TableCell>
+                    <TableCell>
+                      <Select value={line.uomId ? String(line.uomId) : ""} onValueChange={(v) => updateLine(line.key, { uomId: Number(v) })} disabled={locked}>
+                        <SelectTrigger className="h-11!"><SelectValue placeholder="UOM" /></SelectTrigger>
+                        <SelectContent>{uoms.map((u) => <SelectItem key={u.uomId} value={String(u.uomId)}>{u.name}</SelectItem>)}</SelectContent>
+                      </Select>
+                    </TableCell>
+                    <TableCell><Input type="number" min="0" step="0.01" value={line.qty} onChange={(e) => updateLine(line.key, { qty: Number(e.target.value) })} disabled={locked} /></TableCell>
+                    <TableCell><Input type="number" min="0" step="0.01" value={line.freeQty} onChange={(e) => updateLine(line.key, { freeQty: Number(e.target.value) })} disabled={locked} /></TableCell>
+                    <TableCell><Input type="number" min="0" step="0.01" value={line.unitPrice ?? ""} onChange={(e) => updateLine(line.key, { unitPrice: e.target.value === "" ? null : Number(e.target.value) })} disabled={locked} /></TableCell>
+                    <TableCell><Button type="button" variant="ghost" size="icon" onClick={() => removeLine(line.key)} disabled={locked}><Minus className="size-4" /></Button></TableCell>
+                  </TableRow>
+                ))}
+              </TableBody>
+            </Table>
+            <div className="mt-4 text-sm text-muted-foreground">Subtotal: {subtotal.toFixed(2)}</div>
+          </div>
+
+          <FreeIssuePromotionSuggestions suggestion={promotionSuggestion} />
+
+          <div className="flex justify-end gap-3">
+            <Link href="/dashboard/sales/slips" className={cn(buttonVariants({ variant: "outline", size: "lg" }))}>Back</Link>
+            <Button variant="outline" onClick={save} disabled={saving || locked}>Save</Button>
+            <Button onClick={post} disabled={!canPost}>Post</Button>
+          </div>
+        </>
+      ) : null}
+    </div>
+  )
+}
+
diff --git a/Frontend/erp-system/app/dashboard/sales/slips/new/page.tsx b/Frontend/erp-system/app/dashboard/sales/slips/new/page.tsx
new file mode 100644
index 0000000..b3b3088
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/sales/slips/new/page.tsx
@@ -0,0 +1,440 @@
+"use client"
+
+import { useEffect, useMemo, useState } from "react"
+import { useRouter } from "next/navigation"
+import Link from "next/link"
+import { ArrowLeft, Minus, Plus, Save, Trash2 } from "lucide-react"
+
+import { Button, buttonVariants } from "@/components/ui/button"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
+import { Badge } from "@/components/ui/badge"
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+import { cn } from "@/lib/utils"
+import { getSuggestedUnitPrice } from "@/lib/sales-line-utils"
+import { errorMessage } from "@/lib/error-map"
+import { salesApi } from "@/lib/api/sales"
+import { customersApi } from "@/lib/api/customers"
+import { itemsApi } from "@/lib/api/items"
+import { uomsApi } from "@/lib/api/uoms"
+import { warehousesApi } from "@/lib/api/warehouses"
+import { usersApi } from "@/lib/api/users"
+import { Customer } from "@/types/customers"
+import { ItemListItem, Uom, Warehouse } from "@/types/master-data"
+import { ManagedUser } from "@/types/users"
+import { CreateSalesSlipLineRequest, CreateSalesSlipRequest } from "@/types/sales"
+import { toast } from "@/components/ui/toast"
+
+type Line = CreateSalesSlipLineRequest & { key: string }
+
+const blankLine = (key: string): Line => ({
+  key,
+  itemId: 0,
+  uomId: 0,
+  warehouseId: 0,
+  qty: 1,
+  freeQty: 0,
+  unitPrice: null,
+  allowManualPriceOverride: true,
+  discountMode: "Percentage",
+  discountPct: 0,
+  discountAmount: 0,
+  discountValue: 0,
+  taxPct: 0,
+  isFreeIssue: false,
+  parentLineId: null,
+})
+
+const lkr = new Intl.NumberFormat("en-LK", {
+  style: "currency",
+  currency: "LKR",
+  minimumFractionDigits: 2,
+})
+
+export default function NewSalesSlipPage() {
+  const router = useRouter()
+  const [customers, setCustomers] = useState<Customer[]>([])
+  const [items, setItems] = useState<ItemListItem[]>([])
+  const [uoms, setUoms] = useState<Uom[]>([])
+  const [warehouses, setWarehouses] = useState<Warehouse[]>([])
+  const [users, setUsers] = useState<ManagedUser[]>([])
+  const [customerId, setCustomerId] = useState<number | null>(null)
+  const [warehouseId, setWarehouseId] = useState<number | null>(null)
+  const [cashierUserId, setCashierUserId] = useState<number | null>(null)
+  const [lines, setLines] = useState<Line[]>([blankLine("line-1")])
+  const [loading, setLoading] = useState(true)
+  const [submitError, setSubmitError] = useState<string | null>(null)
+  const [saving, setSaving] = useState(false)
+
+  useEffect(() => {
+    Promise.all([
+      customersApi.list({ pageSize: 200 }),
+      itemsApi.list({ pageSize: 200 }),
+      uomsApi.list({ pageSize: 200 }),
+      warehousesApi.list({ pageSize: 200 }),
+      usersApi.list({ pageSize: 200 }),
+    ])
+      .then(([cust, itemRes, uomRes, whRes, userRes]) => {
+        setCustomers(cust.items)
+        setItems(itemRes.items)
+        setUoms(uomRes.items)
+        setWarehouses(whRes.items)
+        setUsers(userRes.items)
+        setCustomerId(cust.items[0]?.customerId ?? null)
+        setWarehouseId(whRes.items[0]?.warehouseId ?? null)
+        setCashierUserId(userRes.items[0]?.userId ?? null)
+        setLines([
+          {
+            ...blankLine("line-1"),
+            itemId: itemRes.items[0]?.itemId ?? 0,
+            uomId: itemRes.items[0]?.baseUomId ?? uomRes.items[0]?.uomId ?? 0,
+            warehouseId: whRes.items[0]?.warehouseId ?? 0,
+            unitPrice: getSuggestedUnitPrice(itemRes.items, itemRes.items[0]?.itemId),
+          },
+        ])
+      })
+      .catch((err) => setSubmitError(errorMessage(err)))
+      .finally(() => setLoading(false))
+  }, [])
+
+  function updateLine(key: string, patch: Partial<Line>) {
+    setLines((prev) => prev.map((line) => (line.key === key ? { ...line, ...patch } : line)))
+  }
+
+  function selectItem(key: string, itemId: number) {
+    const item = items.find((candidate) => candidate.itemId === itemId)
+    updateLine(key, {
+      itemId,
+      uomId: item?.baseUomId ?? 0,
+      unitPrice: getSuggestedUnitPrice(items, itemId),
+    })
+  }
+
+  function addLine() {
+    setLines((prev) => [...prev, blankLine(`line-${Date.now()}`)])
+  }
+
+  function removeLine(key: string) {
+    setLines((prev) => (prev.length === 1 ? prev : prev.filter((line) => line.key !== key)))
+  }
+
+  const grossTotal = useMemo(
+    () => lines.reduce((sum, line) => sum + Number(line.unitPrice ?? 0) * Number(line.qty || 0), 0),
+    [lines],
+  )
+  const discountTotal = useMemo(
+    () =>
+      lines.reduce((sum, line) => {
+        const gross = Number(line.unitPrice ?? 0) * Number(line.qty || 0)
+        const mode = String(line.discountMode)
+        return sum + (mode === "Amount" ? Number(line.discountAmount || 0) : gross * (Number(line.discountPct || 0) / 100))
+      }, 0),
+    [lines],
+  )
+  const taxTotal = useMemo(
+    () =>
+      lines.reduce((sum, line) => {
+        const gross = Number(line.unitPrice ?? 0) * Number(line.qty || 0)
+        const mode = String(line.discountMode)
+        const discount = mode === "Amount" ? Number(line.discountAmount || 0) : gross * (Number(line.discountPct || 0) / 100)
+        const taxable = Math.max(0, gross - discount)
+        return sum + taxable * (Number(line.taxPct || 0) / 100)
+      }, 0),
+    [lines],
+  )
+  const netTotal = Math.max(0, grossTotal - discountTotal)
+  const payableTotal = netTotal + taxTotal
+
+  async function submit() {
+    if (!customerId || !warehouseId || !cashierUserId) return setSubmitError("Select customer, warehouse, and cashier.")
+    if (lines.some((line) => Number(line.itemId) === 0)) return setSubmitError("Select an item for every line.")
+    if (lines.some((line) => Number(line.warehouseId) === 0)) return setSubmitError("Select a warehouse for every line.")
+    if (lines.some((line) => Number(line.uomId) === 0)) return setSubmitError("Select a valid UOM for every line.")
+
+    const payload: CreateSalesSlipRequest = {
+      customerId,
+      warehouseId,
+      cashierUserId,
+      lines: lines.map((line) => ({
+        itemId: Number(line.itemId),
+        uomId: Number(line.uomId),
+        warehouseId: Number(line.warehouseId),
+        qty: Number(line.qty),
+        freeQty: Number(line.freeQty),
+        unitPrice: line.unitPrice === null ? null : Number(line.unitPrice),
+        allowManualPriceOverride: line.allowManualPriceOverride,
+        discountMode: line.discountMode,
+        discountPct: Number(line.discountPct),
+        discountAmount: Number(line.discountAmount),
+        discountValue: Number(line.discountValue),
+        taxPct: Number(line.taxPct),
+        isFreeIssue: line.isFreeIssue,
+        parentLineId: line.parentLineId || null,
+      })),
+    }
+
+    setSaving(true)
+    setSubmitError(null)
+    try {
+      const created = await salesApi.createSlip(payload)
+      toast.success("Slip created", created.data.slipNo)
+      router.push(`/dashboard/sales/slips/${created.data.salesSlipId}`)
+    } catch (err) {
+      setSubmitError(errorMessage(err))
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  if (loading) {
+    return <div className="rounded-2xl border border-border bg-card p-8 text-muted-foreground shadow-[var(--shadow-panel)]">Loading masters...</div>
+  }
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+        <div className="flex items-center gap-3">
+          <Link href="/dashboard/sales/slips" className={cn(buttonVariants({ variant: "outline", size: "icon" }))}>
+            <ArrowLeft className="size-4" />
+          </Link>
+          <div>
+            <h1 className="text-2xl font-bold text-foreground">New sales slip</h1>
+            <p className="text-base text-muted-foreground">Create counter sales slips from the live backend.</p>
+          </div>
+        </div>
+        <div className="flex flex-wrap gap-2">
+          <Button type="button" variant="outline" size="sm" onClick={addLine}>
+            <Plus className="size-4" /> Add line
+          </Button>
+          <Button size="sm" onClick={submit} disabled={saving}>
+            <Save className="size-4" /> {saving ? "Saving..." : "Save slip"}
+          </Button>
+        </div>
+      </div>
+
+      {submitError ? <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{submitError}</div> : null}
+
+      <section className="rounded-2xl border border-border bg-card p-4 shadow-[var(--shadow-panel)]">
+        <h2 className="text-sm font-semibold">Slip header</h2>
+        <div className="mt-3 grid gap-4 sm:grid-cols-2 lg:grid-cols-4">
+          <div className="space-y-1.5">
+            <Label className="text-xs">Customer</Label>
+            <Select value={customerId ? String(customerId) : ""} onValueChange={(v) => setCustomerId(v ? Number(v) : null)}>
+              <SelectTrigger className="h-9 text-sm">
+                <SelectValue placeholder="Select customer" />
+              </SelectTrigger>
+              <SelectContent>
+                {customers.map((c) => (
+                  <SelectItem key={c.customerId} value={String(c.customerId)}>
+                    {c.customerCode} - {c.displayName ?? c.name}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+          </div>
+          <div className="space-y-1.5">
+            <Label className="text-xs">Warehouse</Label>
+            <Select value={warehouseId ? String(warehouseId) : ""} onValueChange={(v) => setWarehouseId(v ? Number(v) : null)}>
+              <SelectTrigger className="h-9 text-sm">
+                <SelectValue placeholder="Select warehouse" />
+              </SelectTrigger>
+              <SelectContent>
+                {warehouses.map((w) => (
+                  <SelectItem key={w.warehouseId} value={String(w.warehouseId)}>
+                    {w.code} - {w.name}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+          </div>
+          <div className="space-y-1.5">
+            <Label className="text-xs">Cashier</Label>
+            <Select value={cashierUserId ? String(cashierUserId) : ""} onValueChange={(v) => setCashierUserId(v ? Number(v) : null)}>
+              <SelectTrigger className="h-9 text-sm">
+                <SelectValue placeholder="Select cashier" />
+              </SelectTrigger>
+              <SelectContent>
+                {users.map((u) => (
+                  <SelectItem key={u.userId} value={String(u.userId)}>
+                    {u.displayName}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+          </div>
+          <div className="space-y-1.5">
+            <Label className="text-xs">Slip summary</Label>
+            <div className="flex h-9 items-center gap-2 rounded-md border border-border bg-secondary/40 px-3 text-xs text-muted-foreground">
+              <Badge variant="outline" className="border-emerald-200 bg-emerald-50 text-emerald-800">
+                Draft
+              </Badge>
+              <span>{lkr.format(payableTotal)}</span>
+            </div>
+          </div>
+        </div>
+      </section>
+
+      <section className="rounded-2xl border border-border bg-card shadow-[var(--shadow-panel)]">
+        <div className="flex items-center justify-between border-b border-border px-4 py-3">
+          <h2 className="text-sm font-semibold">Slip lines</h2>
+          <Button type="button" variant="outline" size="sm" onClick={addLine}>
+            <Plus className="size-4" /> Add line
+          </Button>
+        </div>
+        <div className="overflow-x-auto">
+          <Table className="text-sm">
+            <TableHeader>
+              <TableRow>
+                <TableHead className="h-12 px-4 text-sm">#</TableHead>
+                <TableHead className="h-12 px-4 text-sm">Item</TableHead>
+                <TableHead className="h-12 px-4 text-sm">UOM</TableHead>
+                <TableHead className="h-12 px-4 text-sm text-right">Qty</TableHead>
+                <TableHead className="h-12 px-4 text-sm text-right">Free</TableHead>
+                <TableHead className="h-12 px-4 text-sm text-right">Unit price</TableHead>
+                <TableHead className="h-12 px-4 text-sm text-right">Discount %</TableHead>
+                <TableHead className="h-12 px-4 text-sm text-right">Line total</TableHead>
+                <TableHead className="h-12 px-4 text-sm" />
+              </TableRow>
+            </TableHeader>
+            <TableBody>
+              {lines.map((line, idx) => {
+                const lineGross = Number(line.unitPrice ?? 0) * Number(line.qty || 0)
+                const lineDiscount =
+                  String(line.discountMode) === "Amount"
+                    ? Number(line.discountAmount || 0)
+                    : lineGross * (Number(line.discountPct || 0) / 100)
+                const lineNet = Math.max(0, lineGross - lineDiscount)
+
+                return (
+                  <TableRow key={line.key} className="align-middle">
+                    <TableCell className="px-4 py-2 text-xs text-muted-foreground">{idx + 1}</TableCell>
+                    <TableCell className="px-4 py-2 min-w-64">
+                      <Select value={line.itemId ? String(line.itemId) : ""} onValueChange={(v) => selectItem(line.key, Number(v))}>
+                        <SelectTrigger className="h-9 text-sm">
+                          <SelectValue placeholder="Select item" />
+                        </SelectTrigger>
+                        <SelectContent>
+                          {items.map((candidate) => (
+                            <SelectItem key={candidate.itemId} value={String(candidate.itemId)}>
+                              {candidate.sku} - {candidate.name}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
+                    </TableCell>
+                    <TableCell className="px-4 py-2 min-w-36">
+                      <Select value={line.uomId ? String(line.uomId) : ""} onValueChange={(v) => updateLine(line.key, { uomId: Number(v) })}>
+                        <SelectTrigger className="h-9 text-sm">
+                          <SelectValue placeholder="UOM" />
+                        </SelectTrigger>
+                        <SelectContent>
+                          {uoms.map((u) => (
+                            <SelectItem key={u.uomId} value={String(u.uomId)}>
+                              {u.name}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
+                    </TableCell>
+                    <TableCell className="px-4 py-2">
+                      <Input
+                        type="number"
+                        min="0"
+                        step="0.01"
+                        value={line.qty}
+                        onChange={(e) => updateLine(line.key, { qty: Number(e.target.value) })}
+                        className="h-9 w-24 text-right font-mono text-sm tabular-nums"
+                      />
+                    </TableCell>
+                    <TableCell className="px-4 py-2">
+                      <Input
+                        type="number"
+                        min="0"
+                        step="0.01"
+                        value={line.freeQty}
+                        onChange={(e) => updateLine(line.key, { freeQty: Number(e.target.value) })}
+                        className="h-9 w-24 text-right font-mono text-sm tabular-nums"
+                      />
+                    </TableCell>
+                    <TableCell className="px-4 py-2">
+                      <Input
+                        type="number"
+                        min="0"
+                        step="0.01"
+                        value={line.unitPrice ?? ""}
+                        onChange={(e) => updateLine(line.key, { unitPrice: e.target.value === "" ? null : Number(e.target.value) })}
+                        className="h-9 w-28 text-right font-mono text-sm tabular-nums"
+                      />
+                    </TableCell>
+                    <TableCell className="px-4 py-2">
+                      <Input
+                        type="number"
+                        min="0"
+                        max="100"
+                        step="0.5"
+                        value={line.discountPct}
+                        onChange={(e) => updateLine(line.key, { discountPct: Number(e.target.value) || 0 })}
+                        className="h-9 w-24 text-right font-mono text-sm tabular-nums"
+                      />
+                    </TableCell>
+                    <TableCell className="px-4 py-2 text-right font-mono font-semibold tabular-nums">{lkr.format(lineNet)}</TableCell>
+                    <TableCell className="px-4 py-2 text-right">
+                      <Button
+                        variant="ghost"
+                        size="icon"
+                        className="size-8 text-muted-foreground"
+                        onClick={() => removeLine(line.key)}
+                        disabled={lines.length === 1}
+                      >
+                        <Trash2 className="size-4" />
+                      </Button>
+                    </TableCell>
+                  </TableRow>
+                )
+              })}
+            </TableBody>
+          </Table>
+        </div>
+      </section>
+
+      <section className="grid gap-4 md:grid-cols-2">
+        <div className="rounded-2xl border border-border bg-card p-4 shadow-[var(--shadow-panel)]">
+          <h3 className="text-sm font-semibold">Slip notes</h3>
+          <ul className="mt-3 space-y-2 text-sm text-muted-foreground">
+            <li className="rounded-md border border-border px-3 py-2">Cashier posting follows the standard sales-slip workflow.</li>
+            <li className="rounded-md border border-border px-3 py-2">Free issue lines are captured from the slip itself, not from a separate register here.</li>
+            <li className="rounded-md border border-border px-3 py-2">Use the slip detail page after save to post or cancel.</li>
+          </ul>
+        </div>
+
+        <dl className="rounded-2xl border border-border bg-card p-4 text-sm shadow-[var(--shadow-panel)]">
+          {[
+            ["Gross", lkr.format(grossTotal)],
+            ["Discount", `-${lkr.format(discountTotal)}`],
+            ["Net", lkr.format(netTotal)],
+            ["Tax", lkr.format(taxTotal)],
+          ].map(([k, v]) => (
+            <div key={k} className="flex items-center justify-between py-1.5">
+              <dt className="text-muted-foreground">{k}</dt>
+              <dd className="font-mono tabular-nums">{v}</dd>
+            </div>
+          ))}
+          <div className="mt-2 flex items-center justify-between border-t border-border pt-3">
+            <dt className="font-semibold">Payable</dt>
+            <dd className="font-mono text-base font-semibold tabular-nums">{lkr.format(payableTotal)}</dd>
+          </div>
+        </dl>
+      </section>
+
+      <div className="flex justify-end gap-3">
+        <Link href="/dashboard/sales/slips" className={cn(buttonVariants({ variant: "outline", size: "lg" }))}>
+          Cancel
+        </Link>
+        <Button size="lg" onClick={submit} disabled={saving}>
+          {saving ? "Saving..." : "Create slip"}
+        </Button>
+      </div>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/sales/slips/page.tsx b/Frontend/erp-system/app/dashboard/sales/slips/page.tsx
new file mode 100644
index 0000000..ad31b4a
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/sales/slips/page.tsx
@@ -0,0 +1,235 @@
+"use client"
+
+import { useEffect, useMemo, useState } from "react"
+import Link from "next/link"
+import { ChevronLeft, ChevronRight, Eye, Filter, Package2, Plus, Printer } from "lucide-react"
+
+import { salesApi } from "@/lib/api/sales"
+import { errorMessage } from "@/lib/error-map"
+import { Button, buttonVariants } from "@/components/ui/button"
+import { Badge } from "@/components/ui/badge"
+import { Input } from "@/components/ui/input"
+import { Skeleton } from "@/components/ui/skeleton"
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+import { cn } from "@/lib/utils"
+import { PaginationMeta } from "@/types/common"
+import { SalesSlipStatus, SalesSlipSummary } from "@/types/sales"
+
+type StatusFilter = SalesSlipStatus | "All"
+
+const PAGE_SIZE = 10
+const tabs = ["All", "Draft", "Posted", "Cancelled"] as const
+
+function statusClass(status: SalesSlipStatus) {
+  switch (status) {
+    case "Draft":
+      return "border-amber-200 bg-amber-50 text-amber-800"
+    case "Posted":
+      return "border-emerald-200 bg-emerald-50 text-emerald-800"
+    case "Cancelled":
+      return "border-rose-200 bg-rose-50 text-rose-800"
+  }
+}
+
+export default function SalesSlipsPage() {
+  const [rows, setRows] = useState<SalesSlipSummary[] | null>(null)
+  const [pagination, setPagination] = useState<PaginationMeta | null>(null)
+  const [error, setError] = useState<string | null>(null)
+  const [status, setStatus] = useState<StatusFilter>("All")
+  const [searchInput, setSearchInput] = useState("")
+  const [query, setQuery] = useState("")
+  const [page, setPage] = useState(1)
+
+  useEffect(() => {
+    const timeout = setTimeout(() => setQuery(searchInput.trim()), 300)
+    return () => clearTimeout(timeout)
+  }, [searchInput])
+
+  useEffect(() => setPage(1), [query, status])
+
+  useEffect(() => {
+    setError(null)
+    salesApi
+      .listSlips({ page, pageSize: PAGE_SIZE, status: status === "All" ? undefined : status })
+      .then((res) => {
+        setRows(res.items)
+        setPagination(res.pagination)
+      })
+      .catch((err) => setError(errorMessage(err)))
+  }, [page, status])
+
+  const visibleRows = useMemo(
+    () =>
+      rows?.filter((row) =>
+        `${row.slipNo} ${row.customerSnapshotName}`.toLowerCase().includes(query.toLowerCase())
+      ) ?? [],
+    [rows, query]
+  )
+  const hasFilters = status !== "All" || query.length > 0
+  const grossTotal = visibleRows.reduce((sum, row) => sum + row.totals.subtotal, 0)
+  const discountTotal = visibleRows.reduce((sum, row) => sum + row.totals.discountTotal, 0)
+  const netTotal = visibleRows.reduce((sum, row) => sum + row.totals.grandTotal, 0)
+  const printHref = `/print/sales/slips?status=${encodeURIComponent(status)}&q=${encodeURIComponent(query)}`
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
+        <div>
+          <h1 className="text-2xl font-bold text-foreground">Sales Slips</h1>
+          <p className="text-base text-muted-foreground">Counter sales register with posting and cancellation flow.</p>
+        </div>
+        <div className="flex flex-wrap gap-2">
+          <Link
+            href={printHref}
+            target="_blank"
+            rel="noopener noreferrer"
+            className={cn(buttonVariants({ variant: "outline", size: "lg" }))}
+          >
+            <Printer className="size-5" />
+            Print batch
+          </Link>
+          <Link href="/dashboard/sales/slips/new" className={cn(buttonVariants({ size: "lg" }))}>
+            <Plus className="size-5" />
+            New Slip
+          </Link>
+        </div>
+      </div>
+
+      <div className="rounded-2xl border bg-card shadow-sm">
+        <div className="flex flex-col gap-3 border-b px-4 py-4 lg:flex-row lg:items-center">
+          <div className="flex flex-wrap gap-2">
+            {tabs.map((t) => (
+              <button
+                key={t}
+                onClick={() => setStatus(t)}
+                className={cn(
+                  "rounded-full border px-3 py-1.5 text-xs font-medium transition-colors",
+                  status === t ? "border-primary bg-primary text-primary-foreground" : "border-border text-muted-foreground hover:text-foreground"
+                )}
+              >
+                {t}
+              </button>
+            ))}
+          </div>
+
+          <div className="flex flex-1 flex-col gap-3 lg:flex-row lg:items-center lg:justify-end">
+            <Input
+              value={searchInput}
+              onChange={(e) => setSearchInput(e.target.value)}
+              placeholder="Filter by customer or slip number"
+              className="h-12 w-full lg:max-w-sm"
+            />
+            <Button variant="outline" size="sm" className="lg:ml-auto">
+              <Filter className="size-4" />
+              Advanced
+            </Button>
+          </div>
+        </div>
+
+        {error && <div className="mx-4 mt-4 rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>}
+
+        {!error && rows === null && (
+          <div className="flex flex-col gap-3 px-4 py-4">
+            {Array.from({ length: 5 }).map((_, i) => (
+              <Skeleton key={i} className="h-14 w-full" />
+            ))}
+          </div>
+        )}
+
+        {!error && rows !== null && visibleRows.length === 0 && (
+          <div className="flex flex-col items-center gap-4 px-4 py-20 text-center">
+            <Package2 className="size-12 text-muted-foreground" />
+            <p className="text-base text-muted-foreground">{hasFilters ? "No slips match your filters." : "No slips yet."}</p>
+          </div>
+        )}
+
+        {!error && rows !== null && visibleRows.length > 0 && (
+          <>
+            <div className="overflow-x-auto">
+              <Table className="text-base">
+                <TableHeader>
+                  <TableRow>
+                    <TableHead className="h-12 px-4 text-sm">Slip</TableHead>
+                    <TableHead className="h-12 px-4 text-sm">Customer</TableHead>
+                    <TableHead className="h-12 px-4 text-sm">Date</TableHead>
+                    <TableHead className="h-12 px-4 text-sm">Status</TableHead>
+                    <TableHead className="h-12 px-4 text-sm text-right">Lines</TableHead>
+                    <TableHead className="h-12 px-4 text-sm text-right">Gross</TableHead>
+                    <TableHead className="h-12 px-4 text-sm text-right">Discount</TableHead>
+                    <TableHead className="h-12 px-4 text-sm text-right">Net</TableHead>
+                    <TableHead className="h-12 px-4 text-sm">Actions</TableHead>
+                  </TableRow>
+                </TableHeader>
+                <TableBody>
+                  {visibleRows.map((row) => (
+                    <TableRow key={row.salesSlipId} className="hover:bg-muted/40">
+                      <TableCell className="px-4 py-3.5 font-medium">
+                        <Link href={`/dashboard/sales/slips/${row.salesSlipId}`} className="hover:underline">
+                          {row.slipNo}
+                        </Link>
+                      </TableCell>
+                      <TableCell className="px-4 py-3.5">{row.customerSnapshotName}</TableCell>
+                      <TableCell className="px-4 py-3.5 text-muted-foreground">{new Date(row.createdAt).toLocaleDateString()}</TableCell>
+                      <TableCell className="px-4 py-3.5">
+                        <Badge variant="outline" className={statusClass(row.status)}>
+                          {row.status}
+                        </Badge>
+                      </TableCell>
+                      <TableCell className="px-4 py-3.5 text-right font-mono tabular-nums">{row.totals.freeQtyTotal.toFixed(2)}</TableCell>
+                      <TableCell className="px-4 py-3.5 text-right font-mono tabular-nums">{row.totals.subtotal.toFixed(2)}</TableCell>
+                      <TableCell className="px-4 py-3.5 text-right font-mono tabular-nums text-muted-foreground">-{row.totals.discountTotal.toFixed(2)}</TableCell>
+                      <TableCell className="px-4 py-3.5 text-right font-mono font-semibold tabular-nums">{row.totals.grandTotal.toFixed(2)}</TableCell>
+                      <TableCell className="px-4 py-3.5">
+                        <div className="flex justify-end">
+                          <Link href={`/dashboard/sales/slips/${row.salesSlipId}`} className="inline-flex h-8 w-8 items-center justify-center rounded-full border border-border text-muted-foreground hover:bg-muted hover:text-foreground" aria-label={`View slip ${row.slipNo}`}>
+                            <Eye className="size-4" />
+                          </Link>
+                        </div>
+                      </TableCell>
+                    </TableRow>
+                  ))}
+                </TableBody>
+              </Table>
+            </div>
+
+            <div className="border-t px-4 py-3">
+              <div className="grid gap-3 text-sm md:grid-cols-3">
+                <div className="rounded-lg border bg-muted/20 px-3 py-2">
+                  <div className="text-muted-foreground">Gross total</div>
+                  <div className="font-mono text-base font-semibold tabular-nums">{grossTotal.toFixed(2)}</div>
+                </div>
+                <div className="rounded-lg border bg-muted/20 px-3 py-2">
+                  <div className="text-muted-foreground">Discount total</div>
+                  <div className="font-mono text-base font-semibold tabular-nums">-{discountTotal.toFixed(2)}</div>
+                </div>
+                <div className="rounded-lg border bg-muted/20 px-3 py-2">
+                  <div className="text-muted-foreground">Net total</div>
+                  <div className="font-mono text-base font-semibold tabular-nums">{netTotal.toFixed(2)}</div>
+                </div>
+              </div>
+            </div>
+
+            {pagination && pagination.totalPages > 1 && (
+              <div className="flex flex-col gap-3 border-t px-4 py-4 sm:flex-row sm:items-center sm:justify-between">
+                <p className="text-sm text-muted-foreground">
+                  Showing {(pagination.page - 1) * pagination.pageSize + 1}-{Math.min(pagination.page * pagination.pageSize, pagination.totalItems)} of {pagination.totalItems}
+                </p>
+                <div className="flex items-center gap-2">
+                  <Button type="button" variant="outline" size="sm" disabled={pagination.page <= 1} onClick={() => setPage((p) => Math.max(1, p - 1))}>
+                    <ChevronLeft />
+                    Previous
+                  </Button>
+                  <span className="text-sm text-muted-foreground">Page {pagination.page} of {pagination.totalPages}</span>
+                  <Button type="button" variant="outline" size="sm" disabled={pagination.page >= pagination.totalPages} onClick={() => setPage((p) => Math.min(pagination.totalPages, p + 1))}>
+                    Next
+                    <ChevronRight />
+                  </Button>
+                </div>
+              </div>
+            )}
+          </>
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/settings/company-profile/page.tsx b/Frontend/erp-system/app/dashboard/settings/company-profile/page.tsx
new file mode 100644
index 0000000..a149a86
--- /dev/null
+++ b/Frontend/erp-system/app/dashboard/settings/company-profile/page.tsx
@@ -0,0 +1,135 @@
+"use client"
+
+import { useEffect, useState } from "react"
+import Link from "next/link"
+import { ArrowLeft, Building2, Save } from "lucide-react"
+
+import { companyApi } from "@/lib/api/company"
+import { errorMessage } from "@/lib/error-map"
+import { cn } from "@/lib/utils"
+import { CompanyProfile } from "@/types/company"
+
+import { buttonVariants, Button } from "@/components/ui/button"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { Skeleton } from "@/components/ui/skeleton"
+import { toast } from "@/components/ui/toast"
+
+export default function CompanyProfilePage() {
+  const [profile, setProfile] = useState<CompanyProfile | null>(null)
+  const [etag, setEtag] = useState<string | null>(null)
+  const [error, setError] = useState<string | null>(null)
+  const [saving, setSaving] = useState(false)
+
+  useEffect(() => {
+    companyApi
+      .getProfile()
+      .then((res) => {
+        setProfile(res.data)
+        setEtag(res.etag)
+      })
+      .catch((err) => setError(errorMessage(err)))
+  }, [])
+
+  function patch<K extends keyof CompanyProfile>(key: K, value: CompanyProfile[K]) {
+    setProfile((prev) => (prev ? { ...prev, [key]: value } : prev))
+  }
+
+  async function save() {
+    if (!profile || !etag) return
+    setSaving(true)
+    setError(null)
+    try {
+      const updated = await companyApi.updateProfile(profile, etag)
+      setProfile(updated.data)
+      setEtag(updated.etag)
+      toast.success("Company profile saved", updated.data.legalName)
+    } catch (err) {
+      setError(errorMessage(err))
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex items-center gap-3">
+        <Link href="/dashboard/settings" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
+          <ArrowLeft className="size-5" />
+        </Link>
+        <div>
+          <h1 className="text-2xl font-bold text-foreground">Company Profile</h1>
+          <p className="text-base text-muted-foreground">Invoice header, tax details, logo, and bank information.</p>
+        </div>
+      </div>
+
+      {error && <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>}
+      {!error && !profile && <Skeleton className="h-64 w-full" />}
+
+      {!error && profile && (
+        <div className="flex flex-col gap-6 rounded-2xl border p-6">
+          <div className="flex items-center gap-2">
+            <Building2 className="size-5 text-primary" />
+            <h2 className="text-lg font-semibold">Invoice Header</h2>
+          </div>
+
+          <div className="grid gap-4 md:grid-cols-2">
+            <Field label="Legal Name" value={profile.legalName} onChange={(v) => patch("legalName", v)} />
+            <Field label="Trade Name" value={profile.tradeName ?? ""} onChange={(v) => patch("tradeName", v)} />
+            <Field label="Logo URL" value={profile.logoUrl ?? ""} onChange={(v) => patch("logoUrl", v)} />
+            <Field label="Tax Registration No" value={profile.taxRegistrationNo ?? ""} onChange={(v) => patch("taxRegistrationNo", v)} />
+            <Field label="VAT Registration No" value={profile.vatRegistrationNo ?? ""} onChange={(v) => patch("vatRegistrationNo", v)} />
+            <Field label="Phone" value={profile.phone ?? ""} onChange={(v) => patch("phone", v)} />
+            <Field label="Email" value={profile.email ?? ""} onChange={(v) => patch("email", v)} />
+            <Field label="City" value={profile.city ?? ""} onChange={(v) => patch("city", v)} />
+            <Field label="Country" value={profile.country ?? ""} onChange={(v) => patch("country", v)} />
+            <Field label="Address Line 1" value={profile.addressLine1 ?? ""} onChange={(v) => patch("addressLine1", v)} />
+            <Field label="Address Line 2" value={profile.addressLine2 ?? ""} onChange={(v) => patch("addressLine2", v)} />
+          </div>
+
+          <div className="border-t" />
+
+          <div className="flex items-center gap-2">
+            <Save className="size-5 text-primary" />
+            <h2 className="text-lg font-semibold">Bank Details</h2>
+          </div>
+
+          <div className="grid gap-4 md:grid-cols-2">
+            <Field label="Bank Name" value={profile.bankName ?? ""} onChange={(v) => patch("bankName", v)} />
+            <Field label="Bank Branch" value={profile.bankBranch ?? ""} onChange={(v) => patch("bankBranch", v)} />
+            <Field label="Account Name" value={profile.accountName ?? ""} onChange={(v) => patch("accountName", v)} />
+            <Field label="Account Number" value={profile.accountNumber ?? ""} onChange={(v) => patch("accountNumber", v)} />
+            <Field label="SWIFT Code" value={profile.swiftCode ?? ""} onChange={(v) => patch("swiftCode", v)} />
+            <Field label="Footer Note" value={profile.footerNote ?? ""} onChange={(v) => patch("footerNote", v)} />
+          </div>
+
+          <div className="flex justify-end gap-3">
+            <Link href="/dashboard/settings" className={cn(buttonVariants({ variant: "outline", size: "lg" }))}>
+              Cancel
+            </Link>
+            <Button size="lg" onClick={save} disabled={saving}>
+              {saving ? "Saving..." : "Save Profile"}
+            </Button>
+          </div>
+        </div>
+      )}
+    </div>
+  )
+}
+
+function Field({
+  label,
+  value,
+  onChange,
+}: {
+  label: string
+  value: string
+  onChange: (value: string) => void
+}) {
+  return (
+    <div className="flex flex-col gap-2">
+      <Label>{label}</Label>
+      <Input value={value} onChange={(e) => onChange(e.target.value)} />
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/dashboard/settings/page.tsx b/Frontend/erp-system/app/dashboard/settings/page.tsx
index dbe71d9..70fe245 100644
--- a/Frontend/erp-system/app/dashboard/settings/page.tsx
+++ b/Frontend/erp-system/app/dashboard/settings/page.tsx
@@ -1,5 +1,5 @@
 import Link from "next/link"
-import { ShieldCheck, SlidersHorizontal, Users } from "lucide-react"
+import { Building2, ShieldCheck, SlidersHorizontal, Users } from "lucide-react"
 
 const cards = [
   {
@@ -20,6 +20,12 @@ const cards = [
     icon: SlidersHorizontal,
     description: "Configure product and master-data options",
   },
+  {
+    title: "Company Profile",
+    href: "/dashboard/settings/company-profile",
+    icon: Building2,
+    description: "Invoice header, tax, and bank details",
+  },
 ]
 
 export default function SettingsPage() {
diff --git a/Frontend/erp-system/app/dashboard/settings/roles/[id]/page.tsx b/Frontend/erp-system/app/dashboard/settings/roles/[id]/page.tsx
index 4a439ce..5d2ac07 100644
--- a/Frontend/erp-system/app/dashboard/settings/roles/[id]/page.tsx
+++ b/Frontend/erp-system/app/dashboard/settings/roles/[id]/page.tsx
@@ -3,7 +3,7 @@
 import { useEffect, useState } from "react"
 import { useParams, useRouter } from "next/navigation"
 import Link from "next/link"
-import { AlertTriangle, ArrowLeft, Save } from "lucide-react"
+import { AlertTriangle, Save } from "lucide-react"
 
 import { navApi } from "@/lib/api/nav"
 import { rolesApi } from "@/lib/api/roles"
@@ -132,9 +132,6 @@ export default function RoleDetailPage() {
     <div className="flex flex-col gap-8">
       <div className="flex items-center justify-between">
         <div className="flex items-center gap-3">
-          <Link href="/dashboard/settings/roles" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-            <ArrowLeft className="size-5" />
-          </Link>
           <div>
             <div className="flex items-center gap-3">
               <h1 className="text-2xl font-bold text-foreground">{role.code}</h1>
diff --git a/Frontend/erp-system/app/dashboard/settings/users/[id]/page.tsx b/Frontend/erp-system/app/dashboard/settings/users/[id]/page.tsx
index 6268997..aac81d7 100644
--- a/Frontend/erp-system/app/dashboard/settings/users/[id]/page.tsx
+++ b/Frontend/erp-system/app/dashboard/settings/users/[id]/page.tsx
@@ -3,7 +3,7 @@
 import { useEffect, useState } from "react"
 import { useParams, useRouter } from "next/navigation"
 import Link from "next/link"
-import { ArrowLeft, Save } from "lucide-react"
+import { Save } from "lucide-react"
 
 import { rolesApi } from "@/lib/api/roles"
 import { usersApi } from "@/lib/api/users"
@@ -83,9 +83,6 @@ export default function UserDetailPage() {
   return (
     <div className="flex flex-col gap-6">
       <div className="flex items-center gap-3">
-        <Link href="/dashboard/settings/users" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-          <ArrowLeft className="size-5" />
-        </Link>
         <div>
           <div className="flex items-center gap-3">
             <h1 className="text-2xl font-bold text-foreground">{user.username}</h1>
diff --git a/Frontend/erp-system/app/dashboard/stock/adjustments/new/page.tsx b/Frontend/erp-system/app/dashboard/stock/adjustments/new/page.tsx
index bda4069..95be015 100644
--- a/Frontend/erp-system/app/dashboard/stock/adjustments/new/page.tsx
+++ b/Frontend/erp-system/app/dashboard/stock/adjustments/new/page.tsx
@@ -2,7 +2,7 @@
 
 import { useEffect, useState } from "react"
 import Link from "next/link"
-import { ArrowLeft, CheckCircle2, Plus, Trash2 } from "lucide-react"
+import { CheckCircle2, Plus, Trash2 } from "lucide-react"
 
 import { stockAdjustmentsApi } from "@/lib/api/stock-adjustments"
 import { warehousesApi } from "@/lib/api/warehouses"
@@ -123,9 +123,6 @@ export default function NewAdjustmentPage() {
   return (
     <div className="flex flex-col gap-6">
       <div className="flex items-center gap-3">
-        <Link href="/dashboard/stock/adjustments" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-          <ArrowLeft className="size-5" />
-        </Link>
         <div>
           <h1 className="text-2xl font-bold text-foreground">New Adjustment</h1>
           <p className="text-base text-muted-foreground">Posts immediately on creation (FR-STK-07) — a reason code is mandatory.</p>
diff --git a/Frontend/erp-system/app/dashboard/stock/adjustments/page.tsx b/Frontend/erp-system/app/dashboard/stock/adjustments/page.tsx
index 84d7439..8bebc55 100644
--- a/Frontend/erp-system/app/dashboard/stock/adjustments/page.tsx
+++ b/Frontend/erp-system/app/dashboard/stock/adjustments/page.tsx
@@ -2,7 +2,7 @@
 
 import { useEffect, useState } from "react"
 import Link from "next/link"
-import { ArrowLeft, Plus, SlidersHorizontal } from "lucide-react"
+import { Plus, SlidersHorizontal } from "lucide-react"
 
 import { stockAdjustmentsApi } from "@/lib/api/stock-adjustments"
 import { warehousesApi } from "@/lib/api/warehouses"
@@ -39,9 +39,6 @@ export default function AdjustmentsListPage() {
     <div className="flex flex-col gap-6">
       <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
         <div className="flex items-center gap-3">
-          <Link href="/dashboard/stock" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-            <ArrowLeft className="size-5" />
-          </Link>
           <div>
             <h1 className="text-2xl font-bold text-foreground">Stock Adjustments</h1>
             <p className="text-base text-muted-foreground">Increase, decrease, or write off stock with a reason code (FR-STK-07).</p>
diff --git a/Frontend/erp-system/app/dashboard/stock/counts/[id]/page.tsx b/Frontend/erp-system/app/dashboard/stock/counts/[id]/page.tsx
index 0a61115..d203c1a 100644
--- a/Frontend/erp-system/app/dashboard/stock/counts/[id]/page.tsx
+++ b/Frontend/erp-system/app/dashboard/stock/counts/[id]/page.tsx
@@ -2,15 +2,14 @@
 
 import { useEffect, useState } from "react"
 import { useParams } from "next/navigation"
-import Link from "next/link"
-import { ArrowLeft, CheckCircle2, ClipboardCheck, Save } from "lucide-react"
+import { CheckCircle2, ClipboardCheck, Save } from "lucide-react"
 
 import { stockCountsApi } from "@/lib/api/stock-counts"
 import { errorMessage } from "@/lib/error-map"
 import { cn } from "@/lib/utils"
 import { PostCountResponse, StockCount } from "@/types/stock"
 
-import { Button, buttonVariants } from "@/components/ui/button"
+import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
 import { Skeleton } from "@/components/ui/skeleton"
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
@@ -91,9 +90,6 @@ export default function CountDetailPage() {
     <div className="flex flex-col gap-6">
       <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
         <div className="flex items-center gap-3">
-          <Link href="/dashboard/stock/counts" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-            <ArrowLeft className="size-5" />
-          </Link>
           <div>
             <div className="flex items-center gap-3">
               <h1 className="text-2xl font-bold text-foreground">{count.docNo}</h1>
diff --git a/Frontend/erp-system/app/dashboard/stock/counts/new/page.tsx b/Frontend/erp-system/app/dashboard/stock/counts/new/page.tsx
index 05ecd1e..166502d 100644
--- a/Frontend/erp-system/app/dashboard/stock/counts/new/page.tsx
+++ b/Frontend/erp-system/app/dashboard/stock/counts/new/page.tsx
@@ -3,7 +3,7 @@
 import { useEffect, useState } from "react"
 import { useRouter } from "next/navigation"
 import Link from "next/link"
-import { ArrowLeft } from "lucide-react"
+import {} from "lucide-react"
 
 import { stockCountsApi } from "@/lib/api/stock-counts"
 import { warehousesApi } from "@/lib/api/warehouses"
@@ -82,9 +82,6 @@ export default function NewCountPage() {
   return (
     <div className="flex flex-col gap-6">
       <div className="flex items-center gap-3">
-        <Link href="/dashboard/stock/counts" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-          <ArrowLeft className="size-5" />
-        </Link>
         <div>
           <h1 className="text-2xl font-bold text-foreground">New Count</h1>
           <p className="text-base text-muted-foreground">System quantities are snapshotted immediately; enter counted quantities next.</p>
diff --git a/Frontend/erp-system/app/dashboard/stock/counts/page.tsx b/Frontend/erp-system/app/dashboard/stock/counts/page.tsx
index 6269438..d945a6a 100644
--- a/Frontend/erp-system/app/dashboard/stock/counts/page.tsx
+++ b/Frontend/erp-system/app/dashboard/stock/counts/page.tsx
@@ -2,7 +2,7 @@
 
 import { useEffect, useState } from "react"
 import Link from "next/link"
-import { ArrowLeft, ClipboardList, Plus } from "lucide-react"
+import { ClipboardList, Plus } from "lucide-react"
 
 import { stockCountsApi } from "@/lib/api/stock-counts"
 import { warehousesApi } from "@/lib/api/warehouses"
@@ -36,9 +36,6 @@ export default function CountsListPage() {
     <div className="flex flex-col gap-6">
       <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
         <div className="flex items-center gap-3">
-          <Link href="/dashboard/stock" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-            <ArrowLeft className="size-5" />
-          </Link>
           <div>
             <h1 className="text-2xl font-bold text-foreground">Stock Counts</h1>
             <p className="text-base text-muted-foreground">Cycle or full physical counts (FR-STK-08).</p>
diff --git a/Frontend/erp-system/app/dashboard/stock/enquiry/page.tsx b/Frontend/erp-system/app/dashboard/stock/enquiry/page.tsx
index caf125c..d83de7b 100644
--- a/Frontend/erp-system/app/dashboard/stock/enquiry/page.tsx
+++ b/Frontend/erp-system/app/dashboard/stock/enquiry/page.tsx
@@ -2,17 +2,15 @@
 
 import { useEffect, useMemo, useState } from "react"
 import Link from "next/link"
-import { ArrowLeft, PackageSearch, Search } from "lucide-react"
+import { PackageSearch, Search } from "lucide-react"
 
 import { stockApi } from "@/lib/api/stock"
 import { itemsApi } from "@/lib/api/items"
 import { warehousesApi } from "@/lib/api/warehouses"
 import { errorMessage } from "@/lib/error-map"
-import { cn } from "@/lib/utils"
 import { OnHand } from "@/types/stock"
 import { ItemListItem, Warehouse } from "@/types/master-data"
 
-import { buttonVariants } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
 import { Skeleton } from "@/components/ui/skeleton"
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
@@ -59,9 +57,6 @@ export default function StockEnquiryPage() {
   return (
     <div className="flex flex-col gap-6">
       <div className="flex items-center gap-3">
-        <Link href="/dashboard/stock" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-          <ArrowLeft className="size-5" />
-        </Link>
         <div>
           <h1 className="text-2xl font-bold text-foreground">Stock Enquiry</h1>
           <p className="text-base text-muted-foreground">On-hand, available, on-hold, and in-transit by item and warehouse (FR-STK-12).</p>
diff --git a/Frontend/erp-system/app/dashboard/stock/ledger/page.tsx b/Frontend/erp-system/app/dashboard/stock/ledger/page.tsx
index 1bad740..4572ab9 100644
--- a/Frontend/erp-system/app/dashboard/stock/ledger/page.tsx
+++ b/Frontend/erp-system/app/dashboard/stock/ledger/page.tsx
@@ -1,8 +1,7 @@
 "use client"
 
 import { useEffect, useMemo, useState } from "react"
-import Link from "next/link"
-import { ArrowLeft, ChevronLeft, ChevronRight, ScrollText } from "lucide-react"
+import { ChevronLeft, ChevronRight, ScrollText } from "lucide-react"
 
 import { stockApi } from "@/lib/api/stock"
 import { itemsApi } from "@/lib/api/items"
@@ -13,7 +12,7 @@ import { LedgerEntry } from "@/types/stock"
 import { PaginationMeta } from "@/types/common"
 import { ItemListItem, Warehouse } from "@/types/master-data"
 
-import { Button, buttonVariants } from "@/components/ui/button"
+import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
 import { Label } from "@/components/ui/label"
 import { Skeleton } from "@/components/ui/skeleton"
@@ -81,9 +80,6 @@ export default function StockLedgerPage() {
   return (
     <div className="flex flex-col gap-6">
       <div className="flex items-center gap-3">
-        <Link href="/dashboard/stock" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-          <ArrowLeft className="size-5" />
-        </Link>
         <div>
           <h1 className="text-2xl font-bold text-foreground">Stock Ledger</h1>
           <p className="text-base text-muted-foreground">Immutable, append-only movement journal (FR-STK-01).</p>
diff --git a/Frontend/erp-system/app/dashboard/stock/reorder-alerts/page.tsx b/Frontend/erp-system/app/dashboard/stock/reorder-alerts/page.tsx
index e6db99c..0fd1441 100644
--- a/Frontend/erp-system/app/dashboard/stock/reorder-alerts/page.tsx
+++ b/Frontend/erp-system/app/dashboard/stock/reorder-alerts/page.tsx
@@ -1,18 +1,16 @@
 "use client"
 
 import { useEffect, useMemo, useState } from "react"
-import Link from "next/link"
-import { AlertTriangle, ArrowLeft, CheckCircle2 } from "lucide-react"
+import { AlertTriangle, CheckCircle2 } from "lucide-react"
 
 import { stockApi } from "@/lib/api/stock"
 import { itemsApi } from "@/lib/api/items"
 import { warehousesApi } from "@/lib/api/warehouses"
 import { errorMessage } from "@/lib/error-map"
-import { cn } from "@/lib/utils"
 import { ReorderAlert } from "@/types/stock"
 import { ItemListItem, Warehouse } from "@/types/master-data"
 
-import { Button, buttonVariants } from "@/components/ui/button"
+import { Button } from "@/components/ui/button"
 import { Skeleton } from "@/components/ui/skeleton"
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
 import { toast } from "@/components/ui/toast"
@@ -59,9 +57,6 @@ export default function ReorderAlertsPage() {
   return (
     <div className="flex flex-col gap-6">
       <div className="flex items-center gap-3">
-        <Link href="/dashboard/stock" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-          <ArrowLeft className="size-5" />
-        </Link>
         <div>
           <h1 className="text-2xl font-bold text-foreground">Reorder Alerts</h1>
           <p className="text-base text-muted-foreground">Items at or below their reorder point (FR-STK-10).</p>
diff --git a/Frontend/erp-system/app/dashboard/stock/transfers/[id]/page.tsx b/Frontend/erp-system/app/dashboard/stock/transfers/[id]/page.tsx
index 32574bd..d376106 100644
--- a/Frontend/erp-system/app/dashboard/stock/transfers/[id]/page.tsx
+++ b/Frontend/erp-system/app/dashboard/stock/transfers/[id]/page.tsx
@@ -2,15 +2,13 @@
 
 import { useEffect, useState } from "react"
 import { useParams } from "next/navigation"
-import Link from "next/link"
-import { ArrowLeft, CheckCircle2, PackageCheck, Truck } from "lucide-react"
+import { CheckCircle2, PackageCheck, Truck } from "lucide-react"
 
 import { stockTransfersApi } from "@/lib/api/stock-transfers"
 import { errorMessage } from "@/lib/error-map"
-import { cn } from "@/lib/utils"
 import { DispatchTransferResponse, ReceiveTransferResponse, StockTransfer } from "@/types/stock"
 
-import { Button, buttonVariants } from "@/components/ui/button"
+import { Button } from "@/components/ui/button"
 import { Skeleton } from "@/components/ui/skeleton"
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
 import { toast } from "@/components/ui/toast"
@@ -85,9 +83,6 @@ export default function TransferDetailPage() {
     <div className="flex flex-col gap-6">
       <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
         <div className="flex items-center gap-3">
-          <Link href="/dashboard/stock/transfers" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-            <ArrowLeft className="size-5" />
-          </Link>
           <div>
             <div className="flex items-center gap-3">
               <h1 className="text-2xl font-bold text-foreground">{transfer.docNo}</h1>
diff --git a/Frontend/erp-system/app/dashboard/stock/transfers/new/page.tsx b/Frontend/erp-system/app/dashboard/stock/transfers/new/page.tsx
index c5b628a..2a76ce5 100644
--- a/Frontend/erp-system/app/dashboard/stock/transfers/new/page.tsx
+++ b/Frontend/erp-system/app/dashboard/stock/transfers/new/page.tsx
@@ -3,7 +3,7 @@
 import { useEffect, useState } from "react"
 import { useRouter } from "next/navigation"
 import Link from "next/link"
-import { ArrowLeft, Plus, Trash2 } from "lucide-react"
+import { Plus, Trash2 } from "lucide-react"
 
 import { stockTransfersApi } from "@/lib/api/stock-transfers"
 import { warehousesApi } from "@/lib/api/warehouses"
@@ -138,9 +138,6 @@ export default function NewTransferPage() {
   return (
     <div className="flex flex-col gap-6">
       <div className="flex items-center gap-3">
-        <Link href="/dashboard/stock/transfers" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-          <ArrowLeft className="size-5" />
-        </Link>
         <div>
           <h1 className="text-2xl font-bold text-foreground">New Transfer</h1>
           <p className="text-base text-muted-foreground">Create a transfer, then dispatch and receive it (FR-STK-05).</p>
diff --git a/Frontend/erp-system/app/dashboard/stock/transfers/page.tsx b/Frontend/erp-system/app/dashboard/stock/transfers/page.tsx
index 9282fab..226086a 100644
--- a/Frontend/erp-system/app/dashboard/stock/transfers/page.tsx
+++ b/Frontend/erp-system/app/dashboard/stock/transfers/page.tsx
@@ -2,7 +2,7 @@
 
 import { useEffect, useState } from "react"
 import Link from "next/link"
-import { ArrowLeft, ArrowLeftRight, Plus } from "lucide-react"
+import { ArrowLeftRight, Plus } from "lucide-react"
 
 import { stockTransfersApi } from "@/lib/api/stock-transfers"
 import { warehousesApi } from "@/lib/api/warehouses"
@@ -36,9 +36,6 @@ export default function TransfersListPage() {
     <div className="flex flex-col gap-6">
       <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
         <div className="flex items-center gap-3">
-          <Link href="/dashboard/stock" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-            <ArrowLeft className="size-5" />
-          </Link>
           <div>
             <h1 className="text-2xl font-bold text-foreground">Stock Transfers</h1>
             <p className="text-base text-muted-foreground">Move stock between warehouses (FR-STK-05/06).</p>
diff --git a/Frontend/erp-system/app/dashboard/stock/valuation/page.tsx b/Frontend/erp-system/app/dashboard/stock/valuation/page.tsx
index 34d664b..64ac1a7 100644
--- a/Frontend/erp-system/app/dashboard/stock/valuation/page.tsx
+++ b/Frontend/erp-system/app/dashboard/stock/valuation/page.tsx
@@ -2,18 +2,15 @@
 
 import { Suspense, useEffect, useMemo, useState } from "react"
 import { useRouter, useSearchParams } from "next/navigation"
-import Link from "next/link"
-import { ArrowLeft, BadgeDollarSign } from "lucide-react"
+import { BadgeDollarSign } from "lucide-react"
 
 import { stockApi } from "@/lib/api/stock"
 import { itemsApi } from "@/lib/api/items"
 import { warehousesApi } from "@/lib/api/warehouses"
 import { errorMessage } from "@/lib/error-map"
-import { cn } from "@/lib/utils"
 import { Valuation } from "@/types/stock"
 import { ItemListItem, Warehouse } from "@/types/master-data"
 
-import { buttonVariants } from "@/components/ui/button"
 import { Label } from "@/components/ui/label"
 import { Skeleton } from "@/components/ui/skeleton"
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
@@ -65,9 +62,6 @@ function ValuationContent() {
   return (
     <div className="flex flex-col gap-6">
       <div className="flex items-center gap-3">
-        <Link href="/dashboard/stock" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-          <ArrowLeft className="size-5" />
-        </Link>
         <div>
           <h1 className="text-2xl font-bold text-foreground">Valuation</h1>
           <p className="text-base text-muted-foreground">FIFO cost-layer breakdown and total stock value (FR-STK-04).</p>
diff --git a/Frontend/erp-system/app/dashboard/stock/wastage/new/page.tsx b/Frontend/erp-system/app/dashboard/stock/wastage/new/page.tsx
index ca2037f..bb3a380 100644
--- a/Frontend/erp-system/app/dashboard/stock/wastage/new/page.tsx
+++ b/Frontend/erp-system/app/dashboard/stock/wastage/new/page.tsx
@@ -2,7 +2,7 @@
 
 import { useEffect, useState } from "react"
 import Link from "next/link"
-import { AlertOctagon, ArrowLeft, CheckCircle2 } from "lucide-react"
+import { AlertOctagon, CheckCircle2 } from "lucide-react"
 
 import { isWastageReasonCode, wastageApi } from "@/lib/api/wastage"
 import { reasonCodesApi } from "@/lib/api/reason-codes"
@@ -99,9 +99,6 @@ export default function NewWastagePage() {
   return (
     <div className="flex flex-col gap-6">
       <div className="flex items-center gap-3">
-        <Link href="/dashboard/stock/wastage" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-          <ArrowLeft className="size-5" />
-        </Link>
         <div>
           <h1 className="text-2xl font-bold text-foreground">Record Wastage</h1>
           <p className="text-base text-muted-foreground">Posts immediately as a stock adjustment (FR-STK-07) — a reason code is mandatory.</p>
diff --git a/Frontend/erp-system/app/dashboard/stock/wastage/page.tsx b/Frontend/erp-system/app/dashboard/stock/wastage/page.tsx
index b63d6cf..54a0bbd 100644
--- a/Frontend/erp-system/app/dashboard/stock/wastage/page.tsx
+++ b/Frontend/erp-system/app/dashboard/stock/wastage/page.tsx
@@ -2,7 +2,7 @@
 
 import { useEffect, useMemo, useState } from "react"
 import Link from "next/link"
-import { AlertOctagon, ArrowLeft, Plus } from "lucide-react"
+import { AlertOctagon, Plus } from "lucide-react"
 
 import { isWastageReasonCode, wastageApi, WastageRecord } from "@/lib/api/wastage"
 import { reasonCodesApi } from "@/lib/api/reason-codes"
@@ -68,9 +68,6 @@ export default function WastagePage() {
     <div className="flex flex-col gap-6">
       <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
         <div className="flex items-center gap-3">
-          <Link href="/dashboard/stock" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-            <ArrowLeft className="size-5" />
-          </Link>
           <div>
             <h1 className="text-2xl font-bold text-foreground">Wastage</h1>
             <p className="text-base text-muted-foreground">
diff --git a/Frontend/erp-system/app/dashboard/vendors/[id]/page.tsx b/Frontend/erp-system/app/dashboard/vendors/[id]/page.tsx
index 85730ed..77be003 100644
--- a/Frontend/erp-system/app/dashboard/vendors/[id]/page.tsx
+++ b/Frontend/erp-system/app/dashboard/vendors/[id]/page.tsx
@@ -3,7 +3,7 @@
 import { useEffect, useState } from "react"
 import { useParams, useRouter } from "next/navigation"
 import Link from "next/link"
-import { AlertTriangle, ArrowLeft, Save } from "lucide-react"
+import { AlertTriangle, Save } from "lucide-react"
 
 import { vendorsApi } from "@/lib/api/vendors"
 import { errorMessage, fieldErrors } from "@/lib/error-map"
@@ -132,9 +132,6 @@ export default function VendorDetailPage() {
     <div className="flex flex-col gap-6">
       <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
         <div className="flex items-center gap-3">
-          <Link href="/dashboard/vendors" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-            <ArrowLeft className="size-5" />
-          </Link>
           <div>
             <div className="flex items-center gap-3">
               <h1 className="text-2xl font-bold text-foreground">{vendor.code}</h1>
diff --git a/Frontend/erp-system/app/dashboard/vendors/page.tsx b/Frontend/erp-system/app/dashboard/vendors/page.tsx
index c3afcbf..fc34a81 100644
--- a/Frontend/erp-system/app/dashboard/vendors/page.tsx
+++ b/Frontend/erp-system/app/dashboard/vendors/page.tsx
@@ -5,8 +5,9 @@ import Link from "next/link"
 import { ChevronLeft, ChevronRight, Eye, Pencil, Plus, Search, Trash2, Truck } from "lucide-react"
 
 import { vendorsApi } from "@/lib/api/vendors"
-import { errorMessage, fieldErrors } from "@/lib/error-map"
+import { errorMessage } from "@/lib/error-map"
 import { cn } from "@/lib/utils"
+import { generateVendorCode } from "@/lib/vendor-code"
 import { EntityStatus, PaginationMeta } from "@/types/common"
 import { Vendor } from "@/types/master-data"
 
@@ -44,7 +45,6 @@ export default function VendorsPage() {
   const [page, setPage] = useState(1)
 
   const [open, setOpen] = useState(false)
-  const [code, setCode] = useState("")
   const [name, setName] = useState("")
   const [terms, setTerms] = useState("")
   const [taxReg, setTaxReg] = useState("")
@@ -52,8 +52,14 @@ export default function VendorsPage() {
   const [errors, setErrors] = useState<Record<string, string>>({})
   const [submitting, setSubmitting] = useState(false)
 
+  // Separate from the paginated table list above — this needs every existing code (up to the
+  // server's page-size cap) to de-dupe against, not just the current page's 5 rows.
+  const [allVendorCodes, setAllVendorCodes] = useState<string[]>([])
+
   const [actionPendingId, setActionPendingId] = useState<number | null>(null)
 
+  const generatedCode = name.trim() ? generateVendorCode(name, allVendorCodes) : ""
+
   useEffect(() => {
     const timeout = setTimeout(() => setQuery(searchInput.trim()), 300)
     return () => clearTimeout(timeout)
@@ -75,8 +81,11 @@ export default function VendorsPage() {
 
   useEffect(load, [query, status, page])
 
+  useEffect(() => {
+    vendorsApi.list({ pageSize: 200 }).then((res) => setAllVendorCodes(res.items.map((v) => v.code))).catch(() => {})
+  }, [])
+
   function resetForm() {
-    setCode("")
     setName("")
     setTerms("")
     setTaxReg("")
@@ -86,7 +95,6 @@ export default function VendorsPage() {
 
   async function handleCreate() {
     const nextErrors: Record<string, string> = {}
-    if (!code.trim()) nextErrors.code = "Vendor code is required"
     if (!name.trim()) nextErrors.name = "Vendor name is required"
     if (!currency.trim()) nextErrors.currency = "Currency is required"
     setErrors(nextErrors)
@@ -94,14 +102,15 @@ export default function VendorsPage() {
 
     setSubmitting(true)
     try {
-      const result = await vendorsApi.create({ code, name, terms: terms || null, taxReg: taxReg || null, currency })
+      const result = await vendorsApi.create({ code: generatedCode, name, terms: terms || null, taxReg: taxReg || null, currency })
       toast.success("Vendor created", `${result.data.code} — ${result.data.name}`)
       setOpen(false)
       resetForm()
       load()
+      setAllVendorCodes((codes) => [...codes, result.data.code])
     } catch (err) {
-      const fe = fieldErrors(err)
-      if (fe?.code) setErrors({ code: fe.code })
+      // A 409 here means another creation raced ours for the same generated code — the
+      // proactive de-dupe above only knows about codes loaded when the dialog opened.
       toast.error("Could not create vendor", errorMessage(err))
     } finally {
       setSubmitting(false)
@@ -145,19 +154,18 @@ export default function VendorsPage() {
           <DialogContent className="sm:max-w-md">
             <DialogHeader className="items-center text-center">
               <DialogTitle>New vendor</DialogTitle>
-              <DialogDescription>Create a supplier record.</DialogDescription>
+              <DialogDescription>Create a supplier record. Its code is generated from the name.</DialogDescription>
             </DialogHeader>
             <FieldGroup>
-              <Field data-invalid={!!errors.code}>
-                <FieldLabel htmlFor="v-code">Code</FieldLabel>
-                <Input id="v-code" value={code} onChange={(e) => setCode(e.target.value)} placeholder="VN-005" aria-invalid={!!errors.code} />
-                <FieldError errors={[errors.code ? { message: errors.code } : undefined]} />
-              </Field>
               <Field data-invalid={!!errors.name}>
                 <FieldLabel htmlFor="v-name">Name</FieldLabel>
                 <Input id="v-name" value={name} onChange={(e) => setName(e.target.value)} placeholder="Lanka Steel Traders (Pvt) Ltd" aria-invalid={!!errors.name} />
                 <FieldError errors={[errors.name ? { message: errors.name } : undefined]} />
               </Field>
+              <Field>
+                <FieldLabel htmlFor="v-code">Code (auto-generated)</FieldLabel>
+                <Input id="v-code" value={generatedCode} readOnly disabled placeholder="Enter a name to generate a code" className="text-muted-foreground" />
+              </Field>
               <Field>
                 <FieldLabel htmlFor="v-terms">Payment terms (optional)</FieldLabel>
                 <Input id="v-terms" value={terms} onChange={(e) => setTerms(e.target.value)} placeholder="NET30" />
diff --git a/Frontend/erp-system/app/dashboard/warehouse/[id]/page.tsx b/Frontend/erp-system/app/dashboard/warehouse/[id]/page.tsx
index d8b6826..d973456 100644
--- a/Frontend/erp-system/app/dashboard/warehouse/[id]/page.tsx
+++ b/Frontend/erp-system/app/dashboard/warehouse/[id]/page.tsx
@@ -2,15 +2,13 @@
 
 import { useEffect, useState } from "react"
 import { useParams } from "next/navigation"
-import Link from "next/link"
-import { ArrowLeft, MapPinned, Plus } from "lucide-react"
+import { MapPinned, Plus } from "lucide-react"
 
 import { warehousesApi } from "@/lib/api/warehouses"
 import { errorMessage, fieldErrors } from "@/lib/error-map"
-import { cn } from "@/lib/utils"
 import { Bin, Warehouse } from "@/types/master-data"
 
-import { Button, buttonVariants } from "@/components/ui/button"
+import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
 import { Field, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field"
 import {
@@ -90,9 +88,6 @@ export default function WarehouseDetailPage() {
     <div className="flex flex-col gap-6">
       <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
         <div className="flex items-center gap-3">
-          <Link href="/dashboard/warehouse" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-            <ArrowLeft className="size-5" />
-          </Link>
           <div>
             <h1 className="text-2xl font-bold text-foreground">{warehouse.code}</h1>
             <p className="text-base text-muted-foreground">{warehouse.name} · Bin/location structure (FR-WH-01, FR-MD-07)</p>
diff --git a/Frontend/erp-system/app/dashboard/warehouse/page.tsx b/Frontend/erp-system/app/dashboard/warehouse/page.tsx
index af4d534..6ce171e 100644
--- a/Frontend/erp-system/app/dashboard/warehouse/page.tsx
+++ b/Frontend/erp-system/app/dashboard/warehouse/page.tsx
@@ -2,14 +2,13 @@
 
 import { useEffect, useState } from "react"
 import Link from "next/link"
-import { ArrowLeft, Plus, Warehouse as WarehouseIcon } from "lucide-react"
+import { Plus, Warehouse as WarehouseIcon } from "lucide-react"
 
 import { warehousesApi } from "@/lib/api/warehouses"
 import { errorMessage } from "@/lib/error-map"
-import { cn } from "@/lib/utils"
 import { Bin, Warehouse } from "@/types/master-data"
 
-import { Button, buttonVariants } from "@/components/ui/button"
+import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
 import { Field, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field"
 import {
@@ -100,9 +99,6 @@ export default function WarehousesPage() {
     <div className="flex flex-col gap-6">
       <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
         <div className="flex items-center gap-3">
-          <Link href="/dashboard" className={cn(buttonVariants({ variant: "ghost", size: "icon-lg" }))}>
-            <ArrowLeft className="size-5" />
-          </Link>
           <div>
             <h1 className="text-2xl font-bold text-foreground">Warehouses</h1>
             <p className="text-base text-muted-foreground">Multi-warehouse master data with per-warehouse bin/location structure (FR-WH-01, FR-MD-07).</p>
diff --git a/Frontend/erp-system/app/globals.css b/Frontend/erp-system/app/globals.css
index a0ee55b..b251b5b 100644
--- a/Frontend/erp-system/app/globals.css
+++ b/Frontend/erp-system/app/globals.css
@@ -219,3 +219,34 @@
   }
 }
 
+@media print {
+  body {
+    background: white !important;
+    color: black !important;
+  }
+
+  .print\:hidden {
+    display: none !important;
+  }
+
+  .invoice-sheet {
+    border: 0 !important;
+    box-shadow: none !important;
+    padding: 0 !important;
+  }
+
+  .invoice-header {
+    break-inside: avoid;
+  }
+
+  .invoice-sheet table {
+    width: 100% !important;
+  }
+
+  .invoice-sheet tr,
+  .invoice-sheet td,
+  .invoice-sheet th {
+    break-inside: avoid;
+  }
+}
+
diff --git a/Frontend/erp-system/app/layout.tsx b/Frontend/erp-system/app/layout.tsx
index b1c1f57..28ad97b 100644
--- a/Frontend/erp-system/app/layout.tsx
+++ b/Frontend/erp-system/app/layout.tsx
@@ -1,7 +1,6 @@
 import type { Metadata } from "next";
 import { Geist, Geist_Mono } from "next/font/google";
-import { ThemeProvider } from "next-themes";
-import { TooltipProvider } from "@/components/ui/tooltip";
+import { Providers } from "@/components/providers";
 import "./globals.css";
 
 const geistSans = Geist({
@@ -28,17 +27,11 @@ export default function RootLayout({
     <html
       lang="en"
       className={`${geistSans.variable} ${geistMono.variable} h-full antialiased`}
+      data-scroll-behavior="smooth"
       suppressHydrationWarning
     >
       <body className="min-h-full flex flex-col">
-        <ThemeProvider
-          attribute="class"
-          defaultTheme="light"
-          themes={["light", "dark", "vibrant"]}
-          disableTransitionOnChange
-        >
-          <TooltipProvider>{children}</TooltipProvider>
-        </ThemeProvider>
+        <Providers>{children}</Providers>
       </body>
     </html>
   );
diff --git a/Frontend/erp-system/app/login/page.tsx b/Frontend/erp-system/app/login/page.tsx
index 612976d..345bfa1 100644
--- a/Frontend/erp-system/app/login/page.tsx
+++ b/Frontend/erp-system/app/login/page.tsx
@@ -31,6 +31,8 @@ function LoginForm() {
   const [showPassword, setShowPassword] = useState(false)
   const [remember, setRemember] = useState(false)
   const [submitError, setSubmitError] = useState<string | null>(null)
+  const returnTo = searchParams.get("next")
+  const sessionNotice = returnTo ? "Your session is missing or expired. Sign in again to continue." : null
 
   const form = useForm<LoginValues>({
     resolver: zodResolver(loginSchema),
@@ -85,6 +87,11 @@ function LoginForm() {
         <div className="text-center">
           <h1 className="text-3xl font-bold text-foreground">Sign in to your account</h1>
           <p className="mt-3 text-base text-muted-foreground">Access your ERP dashboard and manage your business</p>
+          {sessionNotice ? (
+            <div className="mt-4 rounded-lg border border-amber-300 bg-amber-50 px-4 py-3 text-sm text-amber-900">
+              {sessionNotice}
+            </div>
+          ) : null}
         </div>
 
         <form onSubmit={onSubmit} noValidate className="mt-10 space-y-6" aria-describedby="form-errors" aria-live="polite">
diff --git a/Frontend/erp-system/app/print/sales/bundles/[id]/page.tsx b/Frontend/erp-system/app/print/sales/bundles/[id]/page.tsx
new file mode 100644
index 0000000..1c834ad
--- /dev/null
+++ b/Frontend/erp-system/app/print/sales/bundles/[id]/page.tsx
@@ -0,0 +1,74 @@
+"use client"
+
+import { useEffect, useState } from "react"
+import { useParams } from "next/navigation"
+import { Printer } from "lucide-react"
+
+import { bundleApi } from "@/lib/api/bundles"
+import { errorMessage } from "@/lib/error-map"
+import { Button } from "@/components/ui/button"
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+import { BundleSale } from "@/types/bundles"
+
+export default function BundlePrintPage() {
+  const params = useParams<{ id: string }>()
+  const bundleSaleId = Number(params.id)
+  const [bundle, setBundle] = useState<BundleSale | null>(null)
+  const [error, setError] = useState<string | null>(null)
+
+  useEffect(() => {
+    if (!Number.isFinite(bundleSaleId)) {
+      setError(`Invalid bundle id '${params.id}'.`)
+      return
+    }
+    bundleApi.getBundle(bundleSaleId).then((res) => setBundle(res)).catch((err) => setError(errorMessage(err)))
+  }, [bundleSaleId, params.id])
+
+  if (error && !bundle) return <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>
+  if (!bundle) return <div className="rounded-2xl border border-dashed p-8 text-muted-foreground">Loading bundle print...</div>
+
+  return (
+    <div className="mx-auto flex w-full max-w-6xl flex-col gap-6 rounded-3xl border bg-white p-6 shadow-sm print:rounded-none print:border-0 print:p-0 print:shadow-none">
+      <div className="flex items-center justify-end print:hidden">
+        <Button variant="outline" onClick={() => window.print()}>
+          <Printer className="size-4" />
+          Print
+        </Button>
+      </div>
+      <div className="border-b pb-4">
+        <div className="text-xs font-semibold uppercase tracking-[0.3em] text-muted-foreground">Bundle Sales</div>
+        <h1 className="mt-2 text-3xl font-semibold text-foreground">{bundle.bundleNo}</h1>
+        <p className="mt-2 text-sm text-muted-foreground">{bundle.bundleName}</p>
+      </div>
+      <div className="grid gap-3 text-sm md:grid-cols-3">
+        <div><div className="text-muted-foreground">Customer</div><div className="font-medium">{bundle.customerSnapshotName}</div></div>
+        <div><div className="text-muted-foreground">Warehouse</div><div className="font-medium">{bundle.warehouseId}</div></div>
+        <div><div className="text-muted-foreground">Status</div><div className="font-medium">{bundle.status}</div></div>
+      </div>
+      <div className="overflow-hidden rounded-2xl border">
+        <Table>
+          <TableHeader>
+            <TableRow>
+              <TableHead>Item</TableHead>
+              <TableHead>Description</TableHead>
+              <TableHead className="text-right">Qty</TableHead>
+              <TableHead className="text-right">Price</TableHead>
+              <TableHead className="text-right">Total</TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            {bundle.lines.map((line) => (
+              <TableRow key={line.bundleSaleLineId}>
+                <TableCell>{line.itemId}</TableCell>
+                <TableCell>{line.description}</TableCell>
+                <TableCell className="text-right">{line.qty.toFixed(2)}</TableCell>
+                <TableCell className="text-right">{line.unitPrice.toFixed(2)}</TableCell>
+                <TableCell className="text-right font-medium">{line.lineTotal.toFixed(2)}</TableCell>
+              </TableRow>
+            ))}
+          </TableBody>
+        </Table>
+      </div>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/print/sales/bundles/page.tsx b/Frontend/erp-system/app/print/sales/bundles/page.tsx
new file mode 100644
index 0000000..ac0db97
--- /dev/null
+++ b/Frontend/erp-system/app/print/sales/bundles/page.tsx
@@ -0,0 +1,90 @@
+"use client"
+
+import { useEffect, useState } from "react"
+import { useSearchParams } from "next/navigation"
+import { Printer } from "lucide-react"
+
+import { bundleApi } from "@/lib/api/bundles"
+import { errorMessage } from "@/lib/error-map"
+import { Button } from "@/components/ui/button"
+import { Badge } from "@/components/ui/badge"
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+import { BundleSaleSummary } from "@/types/bundles"
+
+function statusClass(status: BundleSaleSummary["status"]) {
+  switch (status) {
+    case "Draft":
+      return "border-amber-200 bg-amber-50 text-amber-800"
+    case "Posted":
+      return "border-emerald-200 bg-emerald-50 text-emerald-800"
+    case "Cancelled":
+      return "border-rose-200 bg-rose-50 text-rose-800"
+  }
+}
+
+export default function BundleBatchPrintPage() {
+  const searchParams = useSearchParams()
+  const status = searchParams.get("status") ?? "All"
+  const query = searchParams.get("q") ?? ""
+  const [rows, setRows] = useState<BundleSaleSummary[] | null>(null)
+  const [error, setError] = useState<string | null>(null)
+
+  useEffect(() => {
+    bundleApi.listBundles({ page: 1, pageSize: 200 }).then((res) => setRows(res.items)).catch((err) => setError(errorMessage(err)))
+  }, [])
+
+  const visibleRows = rows?.filter((row) => {
+    const matchesStatus = status === "All" || row.status === status
+    const matchesQuery = `${row.bundleNo} ${row.customerSnapshotName} ${row.bundleName}`.toLowerCase().includes(query.toLowerCase())
+    return matchesStatus && matchesQuery
+  })
+
+  if (error && !rows) return <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>
+  if (!rows) return <div className="rounded-2xl border border-dashed p-8 text-muted-foreground">Loading bundle print data...</div>
+
+  return (
+    <div className="mx-auto flex w-full max-w-6xl flex-col gap-6 rounded-3xl border bg-white p-6 shadow-sm print:rounded-none print:border-0 print:p-0 print:shadow-none">
+      <div className="flex items-center justify-end print:hidden">
+        <Button variant="outline" onClick={() => window.print()}>
+          <Printer className="size-4" />
+          Print
+        </Button>
+      </div>
+      <div className="border-b pb-4">
+        <div className="text-xs font-semibold uppercase tracking-[0.3em] text-muted-foreground">Bundle Sales</div>
+        <h1 className="mt-2 text-3xl font-semibold text-foreground">Bundle Batch Print</h1>
+        <p className="mt-2 text-sm text-muted-foreground">Printed register snapshot of current bundle sales.</p>
+      </div>
+      <div className="overflow-hidden rounded-2xl border">
+        <Table>
+          <TableHeader>
+            <TableRow>
+              <TableHead>Bundle</TableHead>
+              <TableHead>Customer</TableHead>
+              <TableHead>Date</TableHead>
+              <TableHead className="text-right">Price</TableHead>
+              <TableHead className="text-right">Grand</TableHead>
+              <TableHead>Status</TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            {visibleRows?.map((row) => (
+              <TableRow key={row.bundleSaleId}>
+                <TableCell className="font-medium">{row.bundleNo}</TableCell>
+                <TableCell>{row.customerSnapshotName}</TableCell>
+                <TableCell>{new Date(row.createdAt).toLocaleDateString()}</TableCell>
+                <TableCell className="text-right">{row.bundlePrice.toFixed(2)}</TableCell>
+                <TableCell className="text-right font-medium">{row.grandTotal.toFixed(2)}</TableCell>
+                <TableCell>
+                  <Badge variant="outline" className={statusClass(row.status)}>
+                    {row.status}
+                  </Badge>
+                </TableCell>
+              </TableRow>
+            ))}
+          </TableBody>
+        </Table>
+      </div>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/print/sales/invoices/[id]/page.tsx b/Frontend/erp-system/app/print/sales/invoices/[id]/page.tsx
new file mode 100644
index 0000000..629418d
--- /dev/null
+++ b/Frontend/erp-system/app/print/sales/invoices/[id]/page.tsx
@@ -0,0 +1,148 @@
+"use client"
+
+import { use, useEffect, useMemo, useState } from "react"
+import { Printer } from "lucide-react"
+
+import { salesApi } from "@/lib/api/sales"
+import { customersApi } from "@/lib/api/customers"
+import { itemsApi } from "@/lib/api/items"
+import { uomsApi } from "@/lib/api/uoms"
+import { warehousesApi } from "@/lib/api/warehouses"
+import { errorMessage } from "@/lib/error-map"
+import { Button } from "@/components/ui/button"
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+import { Customer } from "@/types/customers"
+import { ItemListItem, Uom, Warehouse } from "@/types/master-data"
+import { SalesInvoice } from "@/types/sales"
+
+export default function SalesInvoicePrintPage({ params }: { params: Promise<{ id: string }> }) {
+  const resolvedParams = use(params)
+  const invoiceId = Number(resolvedParams.id)
+  const [invoice, setInvoice] = useState<SalesInvoice | null>(null)
+  const [customers, setCustomers] = useState<Customer[]>([])
+  const [items, setItems] = useState<ItemListItem[]>([])
+  const [uoms, setUoms] = useState<Uom[]>([])
+  const [warehouses, setWarehouses] = useState<Warehouse[]>([])
+  const [error, setError] = useState<string | null>(null)
+
+  useEffect(() => {
+    if (!Number.isFinite(invoiceId)) {
+      setError(`Invalid invoice id '${resolvedParams.id}'.`)
+      return
+    }
+
+    Promise.all([
+      customersApi.list({ pageSize: 200 }),
+      itemsApi.list({ pageSize: 200 }),
+      uomsApi.list({ pageSize: 200 }),
+      warehousesApi.list({ pageSize: 200 }),
+      salesApi.getInvoice(invoiceId),
+    ])
+      .then(([cust, itemRes, uomRes, whRes, doc]) => {
+        setCustomers(cust.items)
+        setItems(itemRes.items)
+        setUoms(uomRes.items)
+        setWarehouses(whRes.items)
+        setInvoice(doc.data)
+      })
+      .catch((err) => setError(errorMessage(err)))
+  }, [resolvedParams.id, invoiceId])
+
+  const freeQtyTotal = useMemo(() => invoice?.totals.freeQtyTotal ?? 0, [invoice])
+
+  if (error && !invoice) {
+    return <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>
+  }
+
+  if (!invoice) {
+    return <div className="rounded-2xl border border-dashed p-8 text-muted-foreground">{error ?? "Invoice print data is loading or unavailable."}</div>
+  }
+
+  const customer = customers.find((c) => c.customerId === invoice.customerId)
+  const warehouse = warehouses.find((w) => w.warehouseId === invoice.warehouseId)
+
+  return (
+    <div className="invoice-sheet mx-auto flex w-full max-w-5xl flex-col gap-6 rounded-3xl border bg-white p-6 shadow-sm print:rounded-none print:border-0 print:p-0 print:shadow-none">
+      <div className="flex items-center justify-end print:hidden">
+        <Button variant="outline" onClick={() => window.print()}>
+          <Printer className="size-4" />
+          Print
+        </Button>
+      </div>
+
+      <div className="invoice-header grid gap-4 border-b pb-5 md:grid-cols-[1.4fr_1fr]">
+        <div>
+          <div className="text-xs font-semibold uppercase tracking-[0.3em] text-muted-foreground">Sales Invoice</div>
+          <h1 className="mt-2 text-3xl font-semibold text-foreground">{invoice.invoiceNo}</h1>
+          <div className="mt-2 text-sm text-muted-foreground">Status: {invoice.status} · Type: {invoice.invoiceType}</div>
+        </div>
+        <div className="grid gap-2 text-sm md:justify-items-end">
+          <div className="font-semibold text-foreground">ERP Core Trading</div>
+          <div className="text-muted-foreground">Invoice print view</div>
+          <div className="text-muted-foreground">Invoice date: {new Date(invoice.invoiceDate).toLocaleDateString()}</div>
+          <div className="text-muted-foreground">Printed: {new Date().toLocaleString()}</div>
+          <div className="text-muted-foreground">Free qty total: {freeQtyTotal.toFixed(2)}</div>
+        </div>
+      </div>
+
+      <div className="grid gap-4 md:grid-cols-3">
+        <div className="rounded-2xl border bg-muted/20 p-4">
+          <div className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Customer</div>
+          <div className="mt-2 text-lg font-semibold text-foreground">{invoice.customerSnapshotName}</div>
+          <div className="mt-1 text-sm text-muted-foreground">Customer ID: {invoice.customerId}</div>
+          {invoice.customerSnapshotTaxNo ? <div className="mt-1 text-sm text-muted-foreground">Tax No: {invoice.customerSnapshotTaxNo}</div> : null}
+          {customer?.displayName ? <div className="mt-1 text-sm text-muted-foreground">Customer: {customer.displayName}</div> : null}
+        </div>
+        <div className="rounded-2xl border bg-muted/20 p-4">
+          <div className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Warehouse</div>
+          <div className="mt-2 text-lg font-semibold text-foreground">{warehouse?.name ?? `#${invoice.warehouseId}`}</div>
+          <div className="mt-1 text-sm text-muted-foreground">Code: {warehouse?.code ?? invoice.warehouseId}</div>
+        </div>
+        <div className="rounded-2xl border bg-muted/20 p-4">
+          <div className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Totals</div>
+          <div className="mt-2 grid grid-cols-2 gap-2 text-sm">
+            <div className="text-muted-foreground">Subtotal</div><div className="text-right font-medium">{invoice.totals.subtotal.toFixed(2)}</div>
+            <div className="text-muted-foreground">Discount</div><div className="text-right font-medium">{invoice.totals.discountTotal.toFixed(2)}</div>
+            <div className="text-muted-foreground">Free qty</div><div className="text-right font-medium">{freeQtyTotal.toFixed(2)}</div>
+            <div className="text-muted-foreground">Tax</div><div className="text-right font-medium">{invoice.totals.taxTotal.toFixed(2)}</div>
+            <div className="text-muted-foreground">Net payable</div><div className="text-right font-semibold">{invoice.totals.netPayable.toFixed(2)}</div>
+          </div>
+        </div>
+      </div>
+
+      <div className="overflow-hidden rounded-2xl border">
+        <Table>
+          <TableHeader>
+            <TableRow>
+              <TableHead className="w-[34%]">Item</TableHead>
+              <TableHead>UOM</TableHead>
+              <TableHead className="text-right">Qty</TableHead>
+              <TableHead className="text-right">Free</TableHead>
+              <TableHead className="text-right">Unit price</TableHead>
+              <TableHead className="text-right">Discount</TableHead>
+              <TableHead className="text-right">Tax</TableHead>
+              <TableHead className="text-right">Line total</TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            {invoice.lines.map((line) => (
+              <TableRow key={line.salesInvoiceLineId}>
+                <TableCell>
+                  <div className="font-medium text-foreground">{line.description}</div>
+                  <div className="text-xs text-muted-foreground">SKU {items.find((i) => i.itemId === line.itemId)?.sku ?? `#${line.itemId}`}</div>
+                </TableCell>
+                <TableCell>{uoms.find((u) => u.uomId === line.uomId)?.name ?? `#${line.uomId}`}</TableCell>
+                <TableCell className="text-right">{line.qty.toFixed(2)}</TableCell>
+                <TableCell className="text-right">{line.freeQty > 0 ? line.freeQty.toFixed(2) : "—"}</TableCell>
+                <TableCell className="text-right">{line.unitPrice.toFixed(2)}</TableCell>
+                <TableCell className="text-right">{line.discountAmount.toFixed(2)}</TableCell>
+                <TableCell className="text-right">{line.taxAmount.toFixed(2)}</TableCell>
+                <TableCell className="text-right font-medium">{line.lineTotal.toFixed(2)}</TableCell>
+              </TableRow>
+            ))}
+          </TableBody>
+        </Table>
+      </div>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/print/sales/invoices/page.tsx b/Frontend/erp-system/app/print/sales/invoices/page.tsx
new file mode 100644
index 0000000..ab16f55
--- /dev/null
+++ b/Frontend/erp-system/app/print/sales/invoices/page.tsx
@@ -0,0 +1,107 @@
+"use client"
+
+import { useEffect, useState } from "react"
+import { useSearchParams } from "next/navigation"
+import { Printer } from "lucide-react"
+
+import { salesApi } from "@/lib/api/sales"
+import { errorMessage } from "@/lib/error-map"
+import { Button } from "@/components/ui/button"
+import { Badge } from "@/components/ui/badge"
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+import { SalesInvoiceSummary } from "@/types/sales"
+
+function statusClass(status: SalesInvoiceSummary["status"]) {
+  switch (status) {
+    case "Draft":
+      return "border-amber-200 bg-amber-50 text-amber-800"
+    case "Posted":
+      return "border-emerald-200 bg-emerald-50 text-emerald-800"
+    case "Cancelled":
+      return "border-rose-200 bg-rose-50 text-rose-800"
+  }
+}
+
+export default function SalesInvoiceBatchPrintPage() {
+  const searchParams = useSearchParams()
+  const status = searchParams.get("status") ?? "All"
+  const query = searchParams.get("q") ?? ""
+  const [rows, setRows] = useState<SalesInvoiceSummary[] | null>(null)
+  const [error, setError] = useState<string | null>(null)
+
+  useEffect(() => {
+      salesApi
+        .listInvoices({ page: 1, pageSize: 200 })
+        .then((res) => setRows(res.items))
+        .catch((err) => setError(errorMessage(err)))
+  }, [])
+
+  const visibleRows = rows?.filter((row) => {
+    const matchesStatus = status === "All" || row.status === status
+    const matchesQuery =
+      `${row.invoiceNo} ${row.customerSnapshotName}`.toLowerCase().includes(query.toLowerCase())
+    return matchesStatus && matchesQuery
+  })
+
+  if (error && !rows) {
+    return <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>
+  }
+
+  if (!rows) {
+    return <div className="rounded-2xl border border-dashed p-8 text-muted-foreground">{error ?? "Invoice batch print data is loading or unavailable."}</div>
+  }
+
+  return (
+    <div className="mx-auto flex w-full max-w-6xl flex-col gap-6 rounded-3xl border bg-white p-6 shadow-sm print:rounded-none print:border-0 print:p-0 print:shadow-none">
+      <div className="flex items-center justify-end print:hidden">
+        <Button variant="outline" onClick={() => window.print()}>
+          <Printer className="size-4" />
+          Print
+        </Button>
+      </div>
+
+      <div className="border-b pb-4">
+        <div className="text-xs font-semibold uppercase tracking-[0.3em] text-muted-foreground">Sales Invoices</div>
+        <h1 className="mt-2 text-3xl font-semibold text-foreground">Invoice Batch Print</h1>
+        <p className="mt-2 text-sm text-muted-foreground">Printed register snapshot of current invoices.</p>
+      </div>
+
+      <div className="overflow-hidden rounded-2xl border">
+        <Table>
+          <TableHeader>
+            <TableRow>
+              <TableHead>Invoice</TableHead>
+              <TableHead>Customer</TableHead>
+              <TableHead>Date</TableHead>
+              <TableHead>Due</TableHead>
+              <TableHead className="text-right">Lines</TableHead>
+              <TableHead className="text-right">Gross</TableHead>
+              <TableHead className="text-right">Discount</TableHead>
+              <TableHead className="text-right">Net</TableHead>
+              <TableHead>Status</TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            {visibleRows?.map((row) => (
+              <TableRow key={row.salesInvoiceId}>
+                <TableCell className="font-medium">{row.invoiceNo}</TableCell>
+                <TableCell>{row.customerSnapshotName}</TableCell>
+                <TableCell>{new Date(row.createdAt).toLocaleDateString()}</TableCell>
+                <TableCell>{new Date(row.invoiceDate).toLocaleDateString()}</TableCell>
+                <TableCell className="text-right">{row.totals.freeQtyTotal.toFixed(2)}</TableCell>
+                <TableCell className="text-right">{row.totals.subtotal.toFixed(2)}</TableCell>
+                <TableCell className="text-right">-{row.totals.discountTotal.toFixed(2)}</TableCell>
+                <TableCell className="text-right font-medium">{row.totals.grandTotal.toFixed(2)}</TableCell>
+                <TableCell>
+                  <Badge variant="outline" className={statusClass(row.status)}>
+                    {row.status}
+                  </Badge>
+                </TableCell>
+              </TableRow>
+            ))}
+          </TableBody>
+        </Table>
+      </div>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/print/sales/slips/[id]/page.tsx b/Frontend/erp-system/app/print/sales/slips/[id]/page.tsx
new file mode 100644
index 0000000..24ca5db
--- /dev/null
+++ b/Frontend/erp-system/app/print/sales/slips/[id]/page.tsx
@@ -0,0 +1,144 @@
+"use client"
+
+import { use, useEffect, useMemo, useState } from "react"
+import { Printer } from "lucide-react"
+
+import { salesApi } from "@/lib/api/sales"
+import { customersApi } from "@/lib/api/customers"
+import { itemsApi } from "@/lib/api/items"
+import { uomsApi } from "@/lib/api/uoms"
+import { warehousesApi } from "@/lib/api/warehouses"
+import { usersApi } from "@/lib/api/users"
+import { errorMessage } from "@/lib/error-map"
+import { Button } from "@/components/ui/button"
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+import { Customer } from "@/types/customers"
+import { ItemListItem, Uom, Warehouse } from "@/types/master-data"
+import { ManagedUser } from "@/types/users"
+import { SalesSlip } from "@/types/sales"
+
+export default function SalesSlipPrintPage({ params }: { params: Promise<{ id: string }> }) {
+  const resolvedParams = use(params)
+  const slipId = Number(resolvedParams.id)
+  const [slip, setSlip] = useState<SalesSlip | null>(null)
+  const [customers, setCustomers] = useState<Customer[]>([])
+  const [items, setItems] = useState<ItemListItem[]>([])
+  const [uoms, setUoms] = useState<Uom[]>([])
+  const [warehouses, setWarehouses] = useState<Warehouse[]>([])
+  const [users, setUsers] = useState<ManagedUser[]>([])
+  const [error, setError] = useState<string | null>(null)
+
+  useEffect(() => {
+    if (!Number.isFinite(slipId)) {
+      setError(`Invalid slip id '${resolvedParams.id}'.`)
+      return
+    }
+
+    Promise.all([
+      customersApi.list({ pageSize: 200 }),
+      itemsApi.list({ pageSize: 200 }),
+      uomsApi.list({ pageSize: 200 }),
+      warehousesApi.list({ pageSize: 200 }),
+      usersApi.list({ pageSize: 200 }),
+      salesApi.getSlip(slipId),
+    ])
+      .then(([cust, itemRes, uomRes, whRes, userRes, doc]) => {
+        setCustomers(cust.items)
+        setItems(itemRes.items)
+        setUoms(uomRes.items)
+        setWarehouses(whRes.items)
+        setUsers(userRes.items)
+        setSlip(doc.data)
+      })
+      .catch((err) => setError(errorMessage(err)))
+  }, [resolvedParams.id, slipId])
+
+  const subtotal = useMemo(() => slip?.totals.subtotal ?? 0, [slip])
+
+  if (error && !slip) {
+    return <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>
+  }
+
+  if (!slip) {
+    return <div className="rounded-2xl border border-dashed p-8 text-muted-foreground">{error ?? "Slip print data is loading or unavailable."}</div>
+  }
+
+  const customer = customers.find((c) => c.customerId === slip.customerId)
+  const warehouse = warehouses.find((w) => w.warehouseId === slip.warehouseId)
+
+  return (
+    <div className="mx-auto flex w-full max-w-5xl flex-col gap-6 rounded-3xl border bg-white p-6 shadow-sm print:rounded-none print:border-0 print:p-0 print:shadow-none">
+      <div className="flex items-center justify-end print:hidden">
+        <Button variant="outline" onClick={() => window.print()}>
+          <Printer className="size-4" />
+          Print
+        </Button>
+      </div>
+
+      <div className="border-b pb-5">
+        <div className="text-xs font-semibold uppercase tracking-[0.3em] text-muted-foreground">Sales Slip</div>
+        <h1 className="mt-2 text-3xl font-semibold text-foreground">{slip.slipNo}</h1>
+        <div className="mt-2 text-sm text-muted-foreground">Status: {slip.status} · Date: {new Date(slip.slipDate).toLocaleDateString()}</div>
+      </div>
+
+      <div className="grid gap-4 md:grid-cols-3">
+        <div className="rounded-2xl border bg-muted/20 p-4">
+          <div className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Customer</div>
+          <div className="mt-2 text-lg font-semibold text-foreground">{slip.customerSnapshotName}</div>
+          <div className="mt-1 text-sm text-muted-foreground">Customer ID: {slip.customerId}</div>
+          {customer?.displayName ? <div className="mt-1 text-sm text-muted-foreground">Customer: {customer.displayName}</div> : null}
+        </div>
+        <div className="rounded-2xl border bg-muted/20 p-4">
+          <div className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Warehouse</div>
+          <div className="mt-2 text-lg font-semibold text-foreground">{warehouse?.name ?? `#${slip.warehouseId}`}</div>
+          <div className="mt-1 text-sm text-muted-foreground">Code: {warehouse?.code ?? slip.warehouseId}</div>
+        </div>
+        <div className="rounded-2xl border bg-muted/20 p-4">
+          <div className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Totals</div>
+          <div className="mt-2 grid grid-cols-2 gap-2 text-sm">
+            <div className="text-muted-foreground">Subtotal</div><div className="text-right font-medium">{slip.totals.subtotal.toFixed(2)}</div>
+            <div className="text-muted-foreground">Discount</div><div className="text-right font-medium">{slip.totals.discountTotal.toFixed(2)}</div>
+            <div className="text-muted-foreground">Free qty</div><div className="text-right font-medium">{slip.totals.freeQtyTotal.toFixed(2)}</div>
+            <div className="text-muted-foreground">Net total</div><div className="text-right font-semibold">{slip.totals.grandTotal.toFixed(2)}</div>
+          </div>
+        </div>
+      </div>
+
+      <div className="overflow-hidden rounded-2xl border">
+        <Table>
+          <TableHeader>
+            <TableRow>
+              <TableHead>Item</TableHead>
+              <TableHead>UOM</TableHead>
+              <TableHead className="text-right">Qty</TableHead>
+              <TableHead className="text-right">Free</TableHead>
+              <TableHead className="text-right">Unit price</TableHead>
+              <TableHead className="text-right">Line total</TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            {slip.lines.map((line) => (
+              <TableRow key={line.salesSlipLineId}>
+                <TableCell>
+                  <div className="font-medium text-foreground">{line.description}</div>
+                  <div className="text-xs text-muted-foreground">SKU {items.find((i) => i.itemId === line.itemId)?.sku ?? `#${line.itemId}`}</div>
+                </TableCell>
+                <TableCell>{uoms.find((u) => u.uomId === line.uomId)?.name ?? `#${line.uomId}`}</TableCell>
+                <TableCell className="text-right">{line.qty.toFixed(0)}</TableCell>
+                <TableCell className="text-right">{line.freeQty > 0 ? line.freeQty.toFixed(0) : "—"}</TableCell>
+                <TableCell className="text-right">{line.unitPrice.toFixed(2)}</TableCell>
+                <TableCell className="text-right font-medium">{line.lineTotal.toFixed(2)}</TableCell>
+              </TableRow>
+            ))}
+          </TableBody>
+        </Table>
+      </div>
+
+      <div className="rounded-2xl border bg-muted/20 p-4">
+        <div className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Cashier</div>
+        <div className="mt-2 text-sm text-foreground">{users.find((u) => u.userId === slip.cashierUserId)?.displayName ?? `#${slip.cashierUserId}`}</div>
+        <div className="mt-3 text-sm text-muted-foreground">Subtotal: {subtotal.toFixed(2)}</div>
+      </div>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/app/print/sales/slips/page.tsx b/Frontend/erp-system/app/print/sales/slips/page.tsx
new file mode 100644
index 0000000..0c941b4
--- /dev/null
+++ b/Frontend/erp-system/app/print/sales/slips/page.tsx
@@ -0,0 +1,105 @@
+"use client"
+
+import { useEffect, useState } from "react"
+import { useSearchParams } from "next/navigation"
+import { Printer } from "lucide-react"
+
+import { salesApi } from "@/lib/api/sales"
+import { errorMessage } from "@/lib/error-map"
+import { Button } from "@/components/ui/button"
+import { Badge } from "@/components/ui/badge"
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+import { SalesSlipSummary } from "@/types/sales"
+
+function statusClass(status: SalesSlipSummary["status"]) {
+  switch (status) {
+    case "Draft":
+      return "border-amber-200 bg-amber-50 text-amber-800"
+    case "Posted":
+      return "border-emerald-200 bg-emerald-50 text-emerald-800"
+    case "Cancelled":
+      return "border-rose-200 bg-rose-50 text-rose-800"
+  }
+}
+
+export default function SalesSlipBatchPrintPage() {
+  const searchParams = useSearchParams()
+  const status = searchParams.get("status") ?? "All"
+  const query = searchParams.get("q") ?? ""
+  const [rows, setRows] = useState<SalesSlipSummary[] | null>(null)
+  const [error, setError] = useState<string | null>(null)
+
+  useEffect(() => {
+      salesApi
+      .listSlips({ page: 1, pageSize: 200 })
+      .then((res) => setRows(res.items))
+      .catch((err) => setError(errorMessage(err)))
+  }, [])
+
+  const visibleRows = rows?.filter((row) => {
+    const matchesStatus = status === "All" || row.status === status
+    const matchesQuery =
+      `${row.slipNo} ${row.customerSnapshotName}`.toLowerCase().includes(query.toLowerCase())
+    return matchesStatus && matchesQuery
+  })
+
+  if (error && !rows) {
+    return <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>
+  }
+
+  if (!rows) {
+    return <div className="rounded-2xl border border-dashed p-8 text-muted-foreground">{error ?? "Slip batch print data is loading or unavailable."}</div>
+  }
+
+  return (
+    <div className="mx-auto flex w-full max-w-6xl flex-col gap-6 rounded-3xl border bg-white p-6 shadow-sm print:rounded-none print:border-0 print:p-0 print:shadow-none">
+      <div className="flex items-center justify-end print:hidden">
+        <Button variant="outline" onClick={() => window.print()}>
+          <Printer className="size-4" />
+          Print
+        </Button>
+      </div>
+
+      <div className="border-b pb-4">
+        <div className="text-xs font-semibold uppercase tracking-[0.3em] text-muted-foreground">Sales Slips</div>
+        <h1 className="mt-2 text-3xl font-semibold text-foreground">Slip Batch Print</h1>
+        <p className="mt-2 text-sm text-muted-foreground">Printed register snapshot of current slips.</p>
+      </div>
+
+      <div className="overflow-hidden rounded-2xl border">
+        <Table>
+          <TableHeader>
+            <TableRow>
+              <TableHead>Slip</TableHead>
+              <TableHead>Customer</TableHead>
+              <TableHead>Date</TableHead>
+              <TableHead>Status</TableHead>
+              <TableHead className="text-right">Lines</TableHead>
+              <TableHead className="text-right">Gross</TableHead>
+              <TableHead className="text-right">Discount</TableHead>
+              <TableHead className="text-right">Net</TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            {visibleRows?.map((row) => (
+              <TableRow key={row.salesSlipId}>
+                <TableCell className="font-medium">{row.slipNo}</TableCell>
+                <TableCell>{row.customerSnapshotName}</TableCell>
+                <TableCell>{new Date(row.createdAt).toLocaleDateString()}</TableCell>
+                <TableCell>
+                  <Badge variant="outline" className={statusClass(row.status)}>
+                    {row.status}
+                  </Badge>
+                </TableCell>
+                <TableCell className="text-right">{row.totals.freeQtyTotal.toFixed(2)}</TableCell>
+                <TableCell className="text-right">{row.totals.subtotal.toFixed(2)}</TableCell>
+                <TableCell className="text-right">-{row.totals.discountTotal.toFixed(2)}</TableCell>
+                <TableCell className="text-right font-medium">{row.totals.grandTotal.toFixed(2)}</TableCell>
+              </TableRow>
+            ))}
+          </TableBody>
+        </Table>
+      </div>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/components/Layouts/AppSidebar.tsx b/Frontend/erp-system/components/Layouts/AppSidebar.tsx
index c80abe1..4d86d3d 100644
--- a/Frontend/erp-system/components/Layouts/AppSidebar.tsx
+++ b/Frontend/erp-system/components/Layouts/AppSidebar.tsx
@@ -5,26 +5,37 @@ import Link from "next/link"
 import { usePathname } from "next/navigation"
 import {
   Banknote,
+  BadgeDollarSign,
+  BookOpen,
+  BookText,
   Boxes,
   Building2,
   CalendarCheck,
   CalendarClock,
   ChevronRight,
   ClipboardList,
+  CreditCard,
   Factory,
   FileBarChart,
   FileText,
   HelpCircle,
   IdCard,
+  Inbox,
+  Landmark,
   LayoutGrid,
   LayoutTemplate,
+  LineChart,
   ListTree,
   Menu,
   Package,
   PackageCheck,
   PackageX,
   PlayCircle,
+  PieChart,
+  Receipt,
+  ReceiptText,
   Ruler,
+  Scale,
   Settings,
   ShieldCheck,
   ShoppingCart,
@@ -32,6 +43,7 @@ import {
   Tag,
   Truck,
   Users,
+  Wallet,
   Warehouse,
   X,
   type LucideIcon,
@@ -88,6 +100,21 @@ const navItems: {
       { title: "RFQs", code: "procurement.rfqs", href: "/dashboard/procurement/rfqs", icon: FileText },
     ],
   },
+  {
+    title: "Sales",
+    code: "sales",
+    href: "/dashboard/sales",
+    landingHref: "/dashboard/sales/invoices",
+    icon: ReceiptText,
+    chevron: true,
+    children: [
+      { title: "Invoices", code: "sales.invoices", href: "/dashboard/sales/invoices", icon: FileText },
+      { title: "Slips", code: "sales.slips", href: "/dashboard/sales/slips", icon: ShoppingCart },
+      { title: "Bundle Sales", code: "sales.bundle-sales", href: "/dashboard/sales/bundles", icon: Boxes },
+      { title: "Free Issues", code: "sales.free-issues", href: "/dashboard/sales/free-issues", icon: PackageX },
+      // { title: "Reports", code: "sales.reports", href: "/dashboard/sales/reports", icon: FileBarChart },
+    ],
+  },
   { title: "Receiving", code: "receiving", href: "/dashboard/receiving/grn", icon: PackageCheck, chevron: true },
   { title: "Stock", code: "stock", href: "/dashboard/stock", icon: Warehouse, chevron: true },
   { title: "Warehouses", code: "warehouses", href: "/dashboard/warehouse", icon: Building2, chevron: true },
@@ -116,10 +143,38 @@ const navItems: {
       { title: "Attendance", code: "hrm.attendance", href: "/dashboard/hrm/attendance", icon: CalendarCheck },
       { title: "Leave", code: "hrm.leave", href: "/dashboard/hrm/leave", icon: CalendarClock },
       { title: "Payroll", code: "hrm.payroll", href: "/dashboard/hrm/payroll", icon: Banknote },
-      { title: "Reports", code: "hrm.reports", href: "/dashboard/hrm/reports", icon: FileBarChart },
+      // { title: "Reports", code: "hrm.reports", href: "/dashboard/hrm/reports", icon: FileBarChart },
       { title: "Settings", code: "hrm.settings", href: "/dashboard/hrm/settings", icon: SlidersHorizontal },
     ],
   },
+  {
+    title: "Ledgers",
+    code: "ledgers",
+    href: "/dashboard/ledgers",
+    icon: Landmark,
+    chevron: true,
+    children: [
+      { title: "Trial Balance", code: "ledgers.trial-balance", href: "/dashboard/ledgers/trial-balance", icon: Scale },
+      { title: "Balance Sheet", code: "ledgers.balance-sheet", href: "/dashboard/ledgers/balance-sheet", icon: Landmark },
+      { title: "General Ledger", code: "ledgers.general-ledger", href: "/dashboard/ledgers/general-ledger", icon: BookOpen },
+      { title: "Profit & Loss", code: "ledgers.profit-and-loss", href: "/dashboard/ledgers/profit-and-loss", icon: LineChart },
+      { title: "Cash Flow", code: "ledgers.cash-flow", href: "/dashboard/ledgers/cash-flow", icon: PieChart },
+      { title: "Budget vs Actual", code: "ledgers.budget-vs-actual", href: "/dashboard/ledgers/budget-vs-actual", icon: BadgeDollarSign },
+      { title: "Tax Report", code: "ledgers.tax-report", href: "/dashboard/ledgers/tax-report", icon: Receipt },
+    ],
+  },
+  {
+    title: "Accounts",
+    code: "accounts",
+    href: "/dashboard/accounts",
+    icon: CreditCard,
+    chevron: true,
+    children: [
+      { title: "Cash / Bank Accounts", code: "accounts.bank-accounts", href: "/dashboard/accounts/bank-accounts", icon: Wallet },
+      { title: "Cheque Books", code: "accounts.cheque-books", href: "/dashboard/accounts/cheque-books", icon: BookText },
+      { title: "Received Cheques", code: "accounts.received-cheques", href: "/dashboard/accounts/received-cheques", icon: Inbox },
+    ],
+  },
   {
     title: "Settings",
     code: "settings",
@@ -157,7 +212,13 @@ function SidebarContent({
   // route auto-expanded; user toggles are preserved across navigation.
   const [expanded, setExpanded] = useState<Record<string, boolean>>({})
 
-  useEffect(() => {
+  // Adjusted during render (not in an effect) each time pathname or the
+  // available item set changes — `items` starts empty while auth/nav codes
+  // are loading, so this also needs to re-run once the real list arrives.
+  const autoExpandKey = `${pathname}::${items.map((i) => i.code).join(",")}`
+  const [lastAutoExpandKey, setLastAutoExpandKey] = useState<string | null>(null)
+  if (autoExpandKey !== lastAutoExpandKey) {
+    setLastAutoExpandKey(autoExpandKey)
     const parent = items.find((i) => {
       if (!i.children?.length) return false
       if (i.children.some((c) => pathname === c.href || pathname.startsWith(`${c.href}/`))) return true
@@ -168,7 +229,7 @@ function SidebarContent({
     if (parent) {
       setExpanded((prev) => (prev[parent.code] ? prev : { ...prev, [parent.code]: true }))
     }
-  }, [pathname, items])
+  }
 
   const toggleExpand = (code: string) =>
     setExpanded((prev) => ({ ...prev, [code]: !prev[code] }))
@@ -341,14 +402,14 @@ export function AppSidebar() {
   // flashing the full menu to a restricted role. Once resolved, a nav item
   // is visible if its own code is granted, or (for parents) if any child is.
   //
-  // "procurement", "hrm" and "production" are exempted from that check (frontend-only): no
+  // "procurement", "hrm", "sales" and "production" are exempted from that check (frontend-only): no
   // role is currently seeded with NAV:procurement/NAV:hrm/NAV:production or their children
   // server-side, which would hide the whole section for everyone. Remove each bypass once roles are granted
   // the permission properly (Settings → Roles → Sidebar permissions) or a backend seed
   // grants it. This is also flagged in 02-SECURITY.md as the AR-09 sidebar-visibility
   // stopgap for HRM's salary/PII data — it hides HRM from the UI but doesn't enforce
   // anything server-side.
-  const bypassCodes = new Set(["procurement", "hrm", "production"])
+  const bypassCodes = new Set(["procurement", "sales", "hrm", "production"])
   const visibleItems = loading
     ? []
     : navItems
diff --git a/Frontend/erp-system/components/Layouts/Header.tsx b/Frontend/erp-system/components/Layouts/Header.tsx
index 44d22af..c8b4046 100644
--- a/Frontend/erp-system/components/Layouts/Header.tsx
+++ b/Frontend/erp-system/components/Layouts/Header.tsx
@@ -1,6 +1,6 @@
 "use client"
 
-import { useEffect, useState } from "react"
+import { useState } from "react"
 import Link from "next/link"
 import { usePathname, useRouter } from "next/navigation"
 import { ArrowLeft, Bell, LogOut, Settings, User } from "lucide-react"
@@ -41,6 +41,27 @@ const PROCUREMENT_TITLES: Record<string, string> = {
   "/dashboard/procurement/purchase-returns/new": "New Purchase Return",
 }
 
+const LEDGER_TITLES: Record<string, string> = {
+  "/dashboard/ledgers": "Ledgers",
+  "/dashboard/ledgers/trial-balance": "Trial Balance",
+  "/dashboard/ledgers/balance-sheet": "Balance Sheet",
+  "/dashboard/ledgers/general-ledger": "General Ledger",
+  "/dashboard/ledgers/profit-and-loss": "Profit & Loss",
+  "/dashboard/ledgers/cash-flow": "Cash Flow",
+  "/dashboard/ledgers/budget-vs-actual": "Budget vs Actual",
+  "/dashboard/ledgers/tax-report": "Tax Report",
+}
+
+const ACCOUNTS_TITLES: Record<string, string> = {
+  "/dashboard/accounts": "Accounts",
+  "/dashboard/accounts/bank-accounts": "Cash / Bank Accounts",
+  "/dashboard/accounts/bank-accounts/new": "New Bank Account",
+  "/dashboard/accounts/cheque-books": "Cheque Books",
+  "/dashboard/accounts/cheque-books/new": "New Cheque Book",
+  "/dashboard/accounts/received-cheques": "Received Cheques",
+  "/dashboard/accounts/received-cheques/new": "New Received Cheque",
+}
+
 const STOCK_TITLES: Record<string, string> = {
   "/dashboard/stock": "Stock Management",
   "/dashboard/stock/enquiry": "Stock Enquiry",
@@ -62,6 +83,11 @@ function titleFromPath(pathname: string) {
   if (pathname === "/dashboard/receiving/grn/new") return "Create Goods Receipt Note"
   if (/^\/dashboard\/receiving\/grn\/[^/]+$/.test(pathname)) return "Goods Receipt Note"
 
+  if (LEDGER_TITLES[pathname]) return LEDGER_TITLES[pathname]
+
+  if (ACCOUNTS_TITLES[pathname]) return ACCOUNTS_TITLES[pathname]
+  if (/^\/dashboard\/accounts\/cheque-books\/[^/]+$/.test(pathname)) return "Cheque Book"
+
   if (STOCK_TITLES[pathname]) return STOCK_TITLES[pathname]
   if (/^\/dashboard\/stock\/transfers\/[^/]+$/.test(pathname)) return "Stock Transfer"
   if (/^\/dashboard\/stock\/counts\/[^/]+$/.test(pathname)) return "Stock Count"
@@ -85,6 +111,7 @@ function titleFromPath(pathname: string) {
   if (pathname === "/dashboard/products/brands") return "Brands"
   if (pathname === "/dashboard/products/item-types") return "Item Types"
   if (pathname === "/dashboard/products/settings") return "Product Configuration"
+  if (pathname === "/dashboard/settings/company-profile") return "Company Profile"
   if (/^\/dashboard\/products\/[^/]+$/.test(pathname)) return "Item"
 
   const segment = pathname.split("/").filter(Boolean).pop() ?? "dashboard"
@@ -140,8 +167,7 @@ export function Header() {
 
   // Read after mount, not during render: localStorage doesn't exist on the server, and
   // reading it while rendering would desync the hydration pass.
-  const [user, setUser] = useState<AuthUser | null>(null)
-  useEffect(() => setUser(getStoredUser()), [])
+  const [user] = useState<AuthUser | null>(() => getStoredUser())
 
   const markAllAsRead = () =>
     setNotifications((prev) => prev.map((n) => ({ ...n, unread: false })))
diff --git a/Frontend/erp-system/components/accounts/ChequePageDialog.tsx b/Frontend/erp-system/components/accounts/ChequePageDialog.tsx
new file mode 100644
index 0000000..62c75a3
--- /dev/null
+++ b/Frontend/erp-system/components/accounts/ChequePageDialog.tsx
@@ -0,0 +1,381 @@
+"use client"
+
+import { useState } from "react"
+
+import { chequePagesApi } from "@/lib/api/general-ledger"
+import { errorMessage } from "@/lib/error-map"
+import { formatAmount, formatReportDate } from "@/lib/format"
+import { validateIssueChequeForm } from "@/lib/validations/general-ledger"
+import { cn } from "@/lib/utils"
+import { ChequePage, ChequePageIssueStatus, ChequePageStatusAction, PayeeType } from "@/types/general-ledger"
+
+import { Badge } from "@/components/ui/badge"
+import { Button } from "@/components/ui/button"
+import { Checkbox } from "@/components/ui/checkbox"
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog"
+import { Field, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field"
+import { Input } from "@/components/ui/input"
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
+import { toast } from "@/components/ui/toast"
+
+const STATUS_BADGE: Record<ChequePageIssueStatus, string> = {
+  [ChequePageIssueStatus.Unused]: "bg-muted text-muted-foreground",
+  [ChequePageIssueStatus.Issued]: "bg-primary/10 text-primary",
+  [ChequePageIssueStatus.Cleared]: "bg-success/10 text-success",
+  [ChequePageIssueStatus.Bounced]: "bg-destructive/10 text-destructive",
+  [ChequePageIssueStatus.Cancelled]: "bg-destructive/10 text-destructive",
+  [ChequePageIssueStatus.Void]: "bg-muted text-muted-foreground",
+}
+
+type PendingAction = "Issue" | ChequePageStatusAction | null
+
+interface ChequePageDialogProps {
+  page: ChequePage | null
+  open: boolean
+  onOpenChange: (open: boolean) => void
+  /** Called with the server's response after a successful issue/status-update, so the caller's list stays in sync. */
+  onUpdated: (updated: ChequePage) => void
+}
+
+/** View a single cheque page's details, and (from `Unused`/`Issued`) issue it or move it through
+ * Clear/Bounce/Cancel/Void — a modal rather than a separate page, so acting on several leaves from
+ * a book's page list doesn't lose scroll position/context each time (docs/21 §7). */
+export function ChequePageDialog({ page, open, onOpenChange, onUpdated }: ChequePageDialogProps) {
+  const [pendingAction, setPendingAction] = useState<PendingAction>(null)
+  const [submitting, setSubmitting] = useState(false)
+  const [errors, setErrors] = useState<Record<string, string>>({})
+
+  const [payeeType, setPayeeType] = useState<PayeeType>(PayeeType.Supplier)
+  const [payeeName, setPayeeName] = useState("")
+  const [payeeId, setPayeeId] = useState("")
+  const [issueDate, setIssueDate] = useState("")
+  const [amount, setAmount] = useState("")
+  const [currencyCode, setCurrencyCode] = useState("LKR")
+  const [voucherId, setVoucherId] = useState("")
+  const [referenceNo, setReferenceNo] = useState("")
+  const [purpose, setPurpose] = useState("")
+  const [isCrossCheque, setIsCrossCheque] = useState(false)
+  const [isAccountPayee, setIsAccountPayee] = useState(false)
+  const [isPostDated, setIsPostDated] = useState(false)
+  const [notes, setNotes] = useState("")
+  const [printedBy, setPrintedBy] = useState("")
+
+  const [clearedDate, setClearedDate] = useState("")
+  const [cancelReason, setCancelReason] = useState("")
+  const [performedBy, setPerformedBy] = useState("")
+
+  function resetActionState() {
+    setPendingAction(null)
+    setErrors({})
+    setPayeeType(PayeeType.Supplier)
+    setPayeeName("")
+    setPayeeId("")
+    setIssueDate("")
+    setAmount("")
+    setCurrencyCode("LKR")
+    setVoucherId("")
+    setReferenceNo("")
+    setPurpose("")
+    setIsCrossCheque(false)
+    setIsAccountPayee(false)
+    setIsPostDated(false)
+    setNotes("")
+    setPrintedBy("")
+    setClearedDate("")
+    setCancelReason("")
+    setPerformedBy("")
+  }
+
+  function handleOpenChange(next: boolean) {
+    if (!next) resetActionState()
+    onOpenChange(next)
+  }
+
+  async function submitIssue() {
+    if (!page) return
+    const nextErrors = validateIssueChequeForm({ payeeName, issueDate, amount })
+    setErrors(nextErrors)
+    if (Object.keys(nextErrors).length > 0) return
+    setSubmitting(true)
+    try {
+      const updated = await chequePagesApi.issue(page.chequeNo, {
+        payeeType,
+        payeeId: payeeId ? Number(payeeId) : undefined,
+        payeeName,
+        issueDate,
+        amount: Number(amount),
+        currencyCode: currencyCode || undefined,
+        voucherId: voucherId ? Number(voucherId) : undefined,
+        referenceNo: referenceNo || undefined,
+        purpose: purpose || undefined,
+        isCrossCheque,
+        isAccountPayee,
+        isPostDated,
+        notes: notes || undefined,
+        printedBy: printedBy || undefined,
+      })
+      toast.success("Cheque issued", `${updated.chequeNo} → ${updated.payeeName}`)
+      onUpdated(updated)
+      resetActionState()
+    } catch (err) {
+      toast.error("Could not issue cheque", errorMessage(err))
+    } finally {
+      setSubmitting(false)
+    }
+  }
+
+  async function submitStatusAction(action: ChequePageStatusAction) {
+    if (!page) return
+    if (action === ChequePageStatusAction.Clear && !clearedDate) {
+      setErrors({ clearedDate: "Cleared date is required" })
+      return
+    }
+    if (action === ChequePageStatusAction.Cancel && !cancelReason.trim()) {
+      setErrors({ cancelReason: "Cancel reason is required" })
+      return
+    }
+    setSubmitting(true)
+    try {
+      const updated = await chequePagesApi.updateStatus(page.chequeNo, {
+        action,
+        clearedDate: action === ChequePageStatusAction.Clear ? clearedDate : undefined,
+        cancelReason: action === ChequePageStatusAction.Cancel ? cancelReason : undefined,
+        performedBy: performedBy || undefined,
+      })
+      toast.success(`Cheque ${action.toLowerCase()}d`, updated.chequeNo)
+      onUpdated(updated)
+      resetActionState()
+    } catch (err) {
+      toast.error(`Could not ${action.toLowerCase()} cheque`, errorMessage(err))
+    } finally {
+      setSubmitting(false)
+    }
+  }
+
+  if (!page) return null
+
+  const availableActions: ChequePageStatusAction[] =
+    page.issueStatus === ChequePageIssueStatus.Unused
+      ? [ChequePageStatusAction.Cancel, ChequePageStatusAction.Void]
+      : page.issueStatus === ChequePageIssueStatus.Issued
+        ? [ChequePageStatusAction.Clear, ChequePageStatusAction.Bounce, ChequePageStatusAction.Cancel]
+        : []
+
+  return (
+    <Dialog open={open} onOpenChange={handleOpenChange}>
+      <DialogContent className="max-h-[85vh] overflow-y-auto sm:max-w-lg">
+        <DialogHeader>
+          <DialogTitle className="flex items-center gap-2 text-lg">
+            Cheque {page.chequeNo}
+            <Badge variant="outline" className={cn("h-6 justify-center border-transparent text-sm", STATUS_BADGE[page.issueStatus])}>
+              {page.issueStatus}
+            </Badge>
+          </DialogTitle>
+        </DialogHeader>
+
+        {!pendingAction && (
+          <div className="flex flex-col gap-4">
+            <dl className="grid grid-cols-2 gap-x-4 gap-y-2 text-sm">
+              <dt className="text-muted-foreground">Payee</dt>
+              <dd>{page.payeeName ?? "—"}</dd>
+              <dt className="text-muted-foreground">Payee type</dt>
+              <dd>{page.payeeType ?? "—"}</dd>
+              <dt className="text-muted-foreground">Issue date</dt>
+              <dd>{formatReportDate(page.issueDate)}</dd>
+              <dt className="text-muted-foreground">Amount</dt>
+              <dd>{page.amount !== null ? formatAmount(page.amount) : "—"}</dd>
+              <dt className="text-muted-foreground">Reference no.</dt>
+              <dd>{page.referenceNo ?? "—"}</dd>
+              <dt className="text-muted-foreground">Purpose</dt>
+              <dd>{page.purpose ?? "—"}</dd>
+              <dt className="text-muted-foreground">Notes</dt>
+              <dd>{page.notes ?? "—"}</dd>
+              {page.issueStatus === ChequePageIssueStatus.Cleared && (
+                <>
+                  <dt className="text-muted-foreground">Cleared date</dt>
+                  <dd>{formatReportDate(page.clearedDate)}</dd>
+                </>
+              )}
+              {page.issueStatus === ChequePageIssueStatus.Cancelled && (
+                <>
+                  <dt className="text-muted-foreground">Cancel reason</dt>
+                  <dd>{page.cancelReason ?? "—"}</dd>
+                </>
+              )}
+            </dl>
+
+            {availableActions.length > 0 && (
+              <div className="flex flex-wrap gap-2 border-t pt-4">
+                {page.issueStatus === ChequePageIssueStatus.Unused && (
+                  <Button size="sm" onClick={() => setPendingAction("Issue")}>
+                    Issue Cheque
+                  </Button>
+                )}
+                {availableActions.map((action) => (
+                  <Button key={action} size="sm" variant="outline" onClick={() => setPendingAction(action)}>
+                    {action}
+                  </Button>
+                ))}
+              </div>
+            )}
+          </div>
+        )}
+
+        {pendingAction === "Issue" && (
+          <FieldGroup>
+            <Field data-invalid={!!errors.payeeName}>
+              <FieldLabel htmlFor="cp-payee-name">Payee name</FieldLabel>
+              <Input id="cp-payee-name" value={payeeName} onChange={(e) => setPayeeName(e.target.value)} aria-invalid={!!errors.payeeName} />
+              <FieldError errors={[errors.payeeName ? { message: errors.payeeName } : undefined]} />
+            </Field>
+
+            <Field>
+              <FieldLabel htmlFor="cp-payee-type">Payee type</FieldLabel>
+              <Select<PayeeType> value={payeeType} onValueChange={(v) => setPayeeType(v ?? PayeeType.Supplier)}>
+                <SelectTrigger id="cp-payee-type" className="w-full text-base">
+                  <SelectValue />
+                </SelectTrigger>
+                <SelectContent>
+                  {Object.values(PayeeType).map((t) => (
+                    <SelectItem key={t} value={t} label={t} className="text-base">
+                      {t}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+            </Field>
+
+            <Field>
+              <FieldLabel htmlFor="cp-payee-id">Payee ID (optional)</FieldLabel>
+              <Input id="cp-payee-id" type="number" value={payeeId} onChange={(e) => setPayeeId(e.target.value)} />
+            </Field>
+
+            <div className="grid grid-cols-2 gap-3">
+              <Field data-invalid={!!errors.issueDate}>
+                <FieldLabel htmlFor="cp-issue-date">Issue date</FieldLabel>
+                <Input
+                  id="cp-issue-date"
+                  type="date"
+                  value={issueDate}
+                  onChange={(e) => setIssueDate(e.target.value)}
+                  aria-invalid={!!errors.issueDate}
+                />
+                <FieldError errors={[errors.issueDate ? { message: errors.issueDate } : undefined]} />
+              </Field>
+              <Field data-invalid={!!errors.amount}>
+                <FieldLabel htmlFor="cp-amount">Amount</FieldLabel>
+                <Input id="cp-amount" type="number" value={amount} onChange={(e) => setAmount(e.target.value)} aria-invalid={!!errors.amount} />
+                <FieldError errors={[errors.amount ? { message: errors.amount } : undefined]} />
+              </Field>
+            </div>
+
+            <div className="grid grid-cols-2 gap-3">
+              <Field>
+                <FieldLabel htmlFor="cp-currency">Currency</FieldLabel>
+                <Input id="cp-currency" value={currencyCode} onChange={(e) => setCurrencyCode(e.target.value)} maxLength={3} />
+              </Field>
+              <Field>
+                <FieldLabel htmlFor="cp-voucher">Voucher ID (optional)</FieldLabel>
+                <Input id="cp-voucher" type="number" value={voucherId} onChange={(e) => setVoucherId(e.target.value)} />
+              </Field>
+            </div>
+
+            <Field>
+              <FieldLabel htmlFor="cp-ref">Reference no. (optional)</FieldLabel>
+              <Input id="cp-ref" value={referenceNo} onChange={(e) => setReferenceNo(e.target.value)} />
+            </Field>
+
+            <Field>
+              <FieldLabel htmlFor="cp-purpose">Purpose (optional)</FieldLabel>
+              <Input id="cp-purpose" value={purpose} onChange={(e) => setPurpose(e.target.value)} />
+            </Field>
+
+            <div className="flex flex-wrap gap-4">
+              <label className="flex items-center gap-2 text-sm">
+                <Checkbox checked={isCrossCheque} onCheckedChange={(v) => setIsCrossCheque(v === true)} />
+                Cross cheque
+              </label>
+              <label className="flex items-center gap-2 text-sm">
+                <Checkbox checked={isAccountPayee} onCheckedChange={(v) => setIsAccountPayee(v === true)} />
+                Account payee
+              </label>
+              <label className="flex items-center gap-2 text-sm">
+                <Checkbox checked={isPostDated} onCheckedChange={(v) => setIsPostDated(v === true)} />
+                Post-dated
+              </label>
+            </div>
+
+            <Field>
+              <FieldLabel htmlFor="cp-notes">Notes (optional)</FieldLabel>
+              <Input id="cp-notes" value={notes} onChange={(e) => setNotes(e.target.value)} />
+            </Field>
+
+            <Field>
+              <FieldLabel htmlFor="cp-printed-by">Printed by (optional)</FieldLabel>
+              <Input id="cp-printed-by" value={printedBy} onChange={(e) => setPrintedBy(e.target.value)} />
+            </Field>
+          </FieldGroup>
+        )}
+
+        {pendingAction === ChequePageStatusAction.Clear && (
+          <FieldGroup>
+            <Field data-invalid={!!errors.clearedDate}>
+              <FieldLabel htmlFor="cp-cleared-date">Cleared date</FieldLabel>
+              <Input
+                id="cp-cleared-date"
+                type="date"
+                value={clearedDate}
+                onChange={(e) => setClearedDate(e.target.value)}
+                aria-invalid={!!errors.clearedDate}
+              />
+              <FieldError errors={[errors.clearedDate ? { message: errors.clearedDate } : undefined]} />
+            </Field>
+            <Field>
+              <FieldLabel htmlFor="cp-performed-by">Performed by (optional)</FieldLabel>
+              <Input id="cp-performed-by" value={performedBy} onChange={(e) => setPerformedBy(e.target.value)} />
+            </Field>
+          </FieldGroup>
+        )}
+
+        {pendingAction === ChequePageStatusAction.Cancel && (
+          <FieldGroup>
+            <Field data-invalid={!!errors.cancelReason}>
+              <FieldLabel htmlFor="cp-cancel-reason">Cancel reason</FieldLabel>
+              <Input
+                id="cp-cancel-reason"
+                value={cancelReason}
+                onChange={(e) => setCancelReason(e.target.value)}
+                aria-invalid={!!errors.cancelReason}
+              />
+              <FieldError errors={[errors.cancelReason ? { message: errors.cancelReason } : undefined]} />
+            </Field>
+            <Field>
+              <FieldLabel htmlFor="cp-performed-by">Performed by (optional)</FieldLabel>
+              <Input id="cp-performed-by" value={performedBy} onChange={(e) => setPerformedBy(e.target.value)} />
+            </Field>
+          </FieldGroup>
+        )}
+
+        {(pendingAction === ChequePageStatusAction.Bounce || pendingAction === ChequePageStatusAction.Void) && (
+          <FieldGroup>
+            <Field>
+              <FieldLabel htmlFor="cp-performed-by">Performed by (optional)</FieldLabel>
+              <Input id="cp-performed-by" value={performedBy} onChange={(e) => setPerformedBy(e.target.value)} />
+            </Field>
+          </FieldGroup>
+        )}
+
+        {pendingAction && (
+          <DialogFooter>
+            <Button variant="outline" onClick={() => resetActionState()} disabled={submitting}>
+              Back
+            </Button>
+            <Button onClick={() => (pendingAction === "Issue" ? submitIssue() : submitStatusAction(pendingAction))} disabled={submitting}>
+              {submitting ? "Submitting…" : pendingAction === "Issue" ? "Issue Cheque" : pendingAction}
+            </Button>
+          </DialogFooter>
+        )}
+      </DialogContent>
+    </Dialog>
+  )
+}
diff --git a/Frontend/erp-system/components/accounts/ReceivedChequeDialog.tsx b/Frontend/erp-system/components/accounts/ReceivedChequeDialog.tsx
new file mode 100644
index 0000000..1ef4ec2
--- /dev/null
+++ b/Frontend/erp-system/components/accounts/ReceivedChequeDialog.tsx
@@ -0,0 +1,236 @@
+"use client"
+
+import { useEffect, useState } from "react"
+
+import { bankAccountsApi, receivedChequesApi } from "@/lib/api/general-ledger"
+import { errorMessage } from "@/lib/error-map"
+import { formatAmount, formatReportDate } from "@/lib/format"
+import { cn } from "@/lib/utils"
+import {
+  CashAndBankAccountDto,
+  CashBankAccountType,
+  ReceivedCheque,
+  ReceivedChequeStatus,
+  ReceivedChequeStatusAction,
+} from "@/types/general-ledger"
+
+import { Badge } from "@/components/ui/badge"
+import { Button } from "@/components/ui/button"
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog"
+import { Field, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field"
+import { Input } from "@/components/ui/input"
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
+import { toast } from "@/components/ui/toast"
+
+const STATUS_BADGE: Record<ReceivedChequeStatus, string> = {
+  [ReceivedChequeStatus.Received]: "bg-muted text-muted-foreground",
+  [ReceivedChequeStatus.Deposited]: "bg-primary/10 text-primary",
+  [ReceivedChequeStatus.Cleared]: "bg-success/10 text-success",
+  [ReceivedChequeStatus.Returned]: "bg-destructive/10 text-destructive",
+  [ReceivedChequeStatus.Cancelled]: "bg-destructive/10 text-destructive",
+}
+
+interface ReceivedChequeDialogProps {
+  cheque: ReceivedCheque | null
+  open: boolean
+  onOpenChange: (open: boolean) => void
+  onUpdated: (updated: ReceivedCheque) => void
+}
+
+/** View a received cheque's details and (from `Received`/`Deposited`) move it through
+ * Deposit/Clear/Return/Cancel — a modal, same posture as `ChequePageDialog`. */
+export function ReceivedChequeDialog({ cheque, open, onOpenChange, onUpdated }: ReceivedChequeDialogProps) {
+  const [pendingAction, setPendingAction] = useState<ReceivedChequeStatusAction | null>(null)
+  const [submitting, setSubmitting] = useState(false)
+  const [errors, setErrors] = useState<Record<string, string>>({})
+
+  const [bankAccounts, setBankAccounts] = useState<CashAndBankAccountDto[] | null>(null)
+  const [depositBankAccountId, setDepositBankAccountId] = useState("")
+  const [depositDate, setDepositDate] = useState("")
+  const [performedBy, setPerformedBy] = useState("")
+  const [notes, setNotes] = useState("")
+
+  useEffect(() => {
+    if (pendingAction !== ReceivedChequeStatusAction.Deposit || bankAccounts !== null) return
+    bankAccountsApi.list(CashBankAccountType.Bank).then(setBankAccounts).catch(() => setBankAccounts([]))
+    // Only fetched once, lazily, the first time Deposit is chosen.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [pendingAction])
+
+  function resetActionState() {
+    setPendingAction(null)
+    setErrors({})
+    setDepositBankAccountId("")
+    setDepositDate("")
+    setPerformedBy("")
+    setNotes("")
+  }
+
+  function handleOpenChange(next: boolean) {
+    if (!next) resetActionState()
+    onOpenChange(next)
+  }
+
+  async function submitStatusAction(action: ReceivedChequeStatusAction) {
+    if (!cheque) return
+    if (action === ReceivedChequeStatusAction.Deposit) {
+      const nextErrors: Record<string, string> = {}
+      if (!depositBankAccountId) nextErrors.depositBankAccountId = "Select a deposit bank account"
+      if (!depositDate) nextErrors.depositDate = "Deposit date is required"
+      setErrors(nextErrors)
+      if (Object.keys(nextErrors).length > 0) return
+    }
+    setSubmitting(true)
+    try {
+      const updated = await receivedChequesApi.updateStatus(cheque.receivedChequeId, {
+        action,
+        depositBankAccountId: action === ReceivedChequeStatusAction.Deposit ? Number(depositBankAccountId) : undefined,
+        depositDate: action === ReceivedChequeStatusAction.Deposit ? depositDate : undefined,
+        notes: notes || undefined,
+        performedBy: performedBy || undefined,
+      })
+      toast.success(`Cheque ${action.toLowerCase()}ed`, updated.chequeNo)
+      onUpdated(updated)
+      resetActionState()
+    } catch (err) {
+      toast.error(`Could not ${action.toLowerCase()} cheque`, errorMessage(err))
+    } finally {
+      setSubmitting(false)
+    }
+  }
+
+  if (!cheque) return null
+
+  const availableActions: ReceivedChequeStatusAction[] =
+    cheque.status === ReceivedChequeStatus.Received
+      ? [ReceivedChequeStatusAction.Deposit, ReceivedChequeStatusAction.Cancel]
+      : cheque.status === ReceivedChequeStatus.Deposited
+        ? [ReceivedChequeStatusAction.Clear, ReceivedChequeStatusAction.Return]
+        : []
+
+  return (
+    <Dialog open={open} onOpenChange={handleOpenChange}>
+      <DialogContent className="max-h-[85vh] overflow-y-auto sm:max-w-lg">
+        <DialogHeader>
+          <DialogTitle className="flex items-center gap-2 text-lg">
+            Cheque {cheque.chequeNo}
+            <Badge variant="outline" className={cn("h-6 justify-center border-transparent text-sm", STATUS_BADGE[cheque.status])}>
+              {cheque.status}
+            </Badge>
+          </DialogTitle>
+        </DialogHeader>
+
+        {!pendingAction && (
+          <div className="flex flex-col gap-4">
+            <dl className="grid grid-cols-2 gap-x-4 gap-y-2 text-sm">
+              <dt className="text-muted-foreground">Received from</dt>
+              <dd>{cheque.receivedFromName}</dd>
+              <dt className="text-muted-foreground">Type</dt>
+              <dd>{cheque.receivedFromType}</dd>
+              <dt className="text-muted-foreground">Cheque date</dt>
+              <dd>{formatReportDate(cheque.chequeDate)}</dd>
+              <dt className="text-muted-foreground">Amount</dt>
+              <dd>{formatAmount(cheque.amount)}</dd>
+              <dt className="text-muted-foreground">Received date</dt>
+              <dd>{formatReportDate(cheque.receivedDate)}</dd>
+              <dt className="text-muted-foreground">Drawer bank</dt>
+              <dd>{cheque.drawerBankName ?? "—"}</dd>
+              <dt className="text-muted-foreground">Drawer branch</dt>
+              <dd>{cheque.drawerBankBranch ?? "—"}</dd>
+              <dt className="text-muted-foreground">Account holder</dt>
+              <dd>{cheque.accountHolderName ?? "—"}</dd>
+              <dt className="text-muted-foreground">Reference</dt>
+              <dd>{cheque.referenceType ?? "—"}</dd>
+              <dt className="text-muted-foreground">Notes</dt>
+              <dd>{cheque.notes ?? "—"}</dd>
+              {cheque.status === ReceivedChequeStatus.Deposited && (
+                <>
+                  <dt className="text-muted-foreground">Deposited to</dt>
+                  <dd>#{cheque.depositBankAccountId}</dd>
+                  <dt className="text-muted-foreground">Deposit date</dt>
+                  <dd>{formatReportDate(cheque.depositDate)}</dd>
+                </>
+              )}
+            </dl>
+
+            {availableActions.length > 0 && (
+              <div className="flex flex-wrap gap-2 border-t pt-4">
+                {availableActions.map((action) => (
+                  <Button key={action} size="sm" variant="outline" onClick={() => setPendingAction(action)}>
+                    {action}
+                  </Button>
+                ))}
+              </div>
+            )}
+          </div>
+        )}
+
+        {pendingAction === ReceivedChequeStatusAction.Deposit && (
+          <FieldGroup>
+            <Field data-invalid={!!errors.depositBankAccountId}>
+              <FieldLabel htmlFor="rc-deposit-bank">Deposit bank account</FieldLabel>
+              <Select<string> value={depositBankAccountId} onValueChange={(v) => setDepositBankAccountId(v ?? "")}>
+                <SelectTrigger id="rc-deposit-bank" className="w-full text-base" aria-invalid={!!errors.depositBankAccountId}>
+                  <SelectValue placeholder={bankAccounts === null ? "Loading…" : "Select a bank account"} />
+                </SelectTrigger>
+                <SelectContent>
+                  {(bankAccounts ?? []).map((a) => (
+                    <SelectItem key={a.accountId} value={String(a.accountId)} label={a.accountName} className="text-base">
+                      {a.accountName}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+              <FieldError errors={[errors.depositBankAccountId ? { message: errors.depositBankAccountId } : undefined]} />
+            </Field>
+            <Field data-invalid={!!errors.depositDate}>
+              <FieldLabel htmlFor="rc-deposit-date">Deposit date</FieldLabel>
+              <Input
+                id="rc-deposit-date"
+                type="date"
+                value={depositDate}
+                onChange={(e) => setDepositDate(e.target.value)}
+                aria-invalid={!!errors.depositDate}
+              />
+              <FieldError errors={[errors.depositDate ? { message: errors.depositDate } : undefined]} />
+            </Field>
+            <Field>
+              <FieldLabel htmlFor="rc-performed-by">Performed by (optional)</FieldLabel>
+              <Input id="rc-performed-by" value={performedBy} onChange={(e) => setPerformedBy(e.target.value)} />
+            </Field>
+            <Field>
+              <FieldLabel htmlFor="rc-notes">Notes (optional)</FieldLabel>
+              <Input id="rc-notes" value={notes} onChange={(e) => setNotes(e.target.value)} />
+            </Field>
+          </FieldGroup>
+        )}
+
+        {(pendingAction === ReceivedChequeStatusAction.Clear ||
+          pendingAction === ReceivedChequeStatusAction.Return ||
+          pendingAction === ReceivedChequeStatusAction.Cancel) && (
+          <FieldGroup>
+            <Field>
+              <FieldLabel htmlFor="rc-performed-by">Performed by (optional)</FieldLabel>
+              <Input id="rc-performed-by" value={performedBy} onChange={(e) => setPerformedBy(e.target.value)} />
+            </Field>
+            <Field>
+              <FieldLabel htmlFor="rc-notes">Notes (optional)</FieldLabel>
+              <Input id="rc-notes" value={notes} onChange={(e) => setNotes(e.target.value)} />
+            </Field>
+          </FieldGroup>
+        )}
+
+        {pendingAction && (
+          <DialogFooter>
+            <Button variant="outline" onClick={() => resetActionState()} disabled={submitting}>
+              Back
+            </Button>
+            <Button onClick={() => submitStatusAction(pendingAction)} disabled={submitting}>
+              {submitting ? "Submitting…" : pendingAction}
+            </Button>
+          </DialogFooter>
+        )}
+      </DialogContent>
+    </Dialog>
+  )
+}
diff --git a/Frontend/erp-system/components/dashboard/recent-orders-table.tsx b/Frontend/erp-system/components/dashboard/recent-orders-table.tsx
index 3bf1829..45c5fe6 100644
--- a/Frontend/erp-system/components/dashboard/recent-orders-table.tsx
+++ b/Frontend/erp-system/components/dashboard/recent-orders-table.tsx
@@ -29,9 +29,9 @@ const statusStyles: Record<Order["status"], string> = {
 }
 
 // Use a fixed locale to avoid hydration mismatches between server and client
-const currency = new Intl.NumberFormat("en-US", {
+const currency = new Intl.NumberFormat("en-LK", {
   style: "currency",
-  currency: "USD",
+  currency: "LKR",
 })
 
 const columns: DataTableColumn<Order>[] = [
diff --git a/Frontend/erp-system/components/providers.tsx b/Frontend/erp-system/components/providers.tsx
new file mode 100644
index 0000000..e3dd194
--- /dev/null
+++ b/Frontend/erp-system/components/providers.tsx
@@ -0,0 +1,13 @@
+"use client"
+
+import { ThemeProvider } from "next-themes"
+
+import { TooltipProvider } from "@/components/ui/tooltip"
+
+export function Providers({ children }: { children: React.ReactNode }) {
+  return (
+    <ThemeProvider attribute="class" defaultTheme="light" themes={["light", "dark", "vibrant"]} disableTransitionOnChange>
+      <TooltipProvider>{children}</TooltipProvider>
+    </ThemeProvider>
+  )
+}
diff --git a/Frontend/erp-system/components/reports/DownloadCsvButton.tsx b/Frontend/erp-system/components/reports/DownloadCsvButton.tsx
new file mode 100644
index 0000000..76158fb
--- /dev/null
+++ b/Frontend/erp-system/components/reports/DownloadCsvButton.tsx
@@ -0,0 +1,42 @@
+"use client"
+
+import { useState } from "react"
+import { FileSpreadsheet } from "lucide-react"
+
+import { reportsApi } from "@/lib/api/general-ledger"
+import { errorMessage } from "@/lib/error-map"
+import { ReportType } from "@/types/general-ledger"
+
+import { Button } from "@/components/ui/button"
+import { toast } from "@/components/ui/toast"
+
+interface DownloadCsvButtonProps {
+  reportType: ReportType
+  /** Same filter params already sent to the Json call — outputFormat is added here, not by the caller. */
+  params: Record<string, string | number | undefined>
+  /** Disable while the on-screen report itself hasn't loaded (nothing to name the download after would be odd otherwise). */
+  disabled?: boolean
+}
+
+/** Same mechanism as DownloadPdfButton, `outputFormat=Csv` — GL's bytes are downloaded unmodified. */
+export function DownloadCsvButton({ reportType, params, disabled }: DownloadCsvButtonProps) {
+  const [downloading, setDownloading] = useState(false)
+
+  async function handleDownload() {
+    setDownloading(true)
+    try {
+      await reportsApi.downloadCsv(reportType, params)
+    } catch (err) {
+      toast.error("Could not download report", errorMessage(err))
+    } finally {
+      setDownloading(false)
+    }
+  }
+
+  return (
+    <Button variant="outline" onClick={handleDownload} disabled={disabled || downloading}>
+      <FileSpreadsheet className="size-4" />
+      {downloading ? "Preparing…" : "Download CSV"}
+    </Button>
+  )
+}
diff --git a/Frontend/erp-system/components/reports/DownloadPdfButton.tsx b/Frontend/erp-system/components/reports/DownloadPdfButton.tsx
new file mode 100644
index 0000000..fc4fae2
--- /dev/null
+++ b/Frontend/erp-system/components/reports/DownloadPdfButton.tsx
@@ -0,0 +1,41 @@
+"use client"
+
+import { useState } from "react"
+import { Download } from "lucide-react"
+
+import { reportsApi } from "@/lib/api/general-ledger"
+import { errorMessage } from "@/lib/error-map"
+import { ReportType } from "@/types/general-ledger"
+
+import { Button } from "@/components/ui/button"
+import { toast } from "@/components/ui/toast"
+
+interface DownloadPdfButtonProps {
+  reportType: ReportType
+  /** Same filter params already sent to the Json call — outputFormat is added here, not by the caller. */
+  params: Record<string, string | number | undefined>
+  /** Disable while the on-screen report itself hasn't loaded (nothing to name the download after would be odd otherwise). */
+  disabled?: boolean
+}
+
+export function DownloadPdfButton({ reportType, params, disabled }: DownloadPdfButtonProps) {
+  const [downloading, setDownloading] = useState(false)
+
+  async function handleDownload() {
+    setDownloading(true)
+    try {
+      await reportsApi.downloadPdf(reportType, params)
+    } catch (err) {
+      toast.error("Could not download report", errorMessage(err))
+    } finally {
+      setDownloading(false)
+    }
+  }
+
+  return (
+    <Button variant="outline" onClick={handleDownload} disabled={disabled || downloading}>
+      <Download className="size-4" />
+      {downloading ? "Preparing…" : "Download PDF"}
+    </Button>
+  )
+}
diff --git a/Frontend/erp-system/components/reports/ReportHeader.tsx b/Frontend/erp-system/components/reports/ReportHeader.tsx
new file mode 100644
index 0000000..c568ec8
--- /dev/null
+++ b/Frontend/erp-system/components/reports/ReportHeader.tsx
@@ -0,0 +1,27 @@
+// Statutory-style report header (docs/21-GENERAL-LEDGER-FRONTEND.md "Sri Lankan Standard report
+// UI"): centered title block, LKAS-aligned statement names, period/as-at line, currency note —
+// the same shape whether the report renders on screen or the downloaded PDF (the PDF itself is
+// rendered server-side by the GL service; this header is the on-screen equivalent).
+
+interface ReportHeaderProps {
+  title: string
+  subtitle: string
+  currencyNote?: string
+}
+
+export function ReportHeader({
+  title,
+  subtitle,
+  currencyNote = "All amounts in Sri Lankan Rupees (LKR) unless stated otherwise.",
+}: ReportHeaderProps) {
+  return (
+    <div className="flex flex-col items-center gap-1 border-b-2 border-foreground/70 px-4 pb-5 text-center">
+      <p className="text-xs font-semibold tracking-[0.2em] text-muted-foreground uppercase">
+        General Ledger
+      </p>
+      <h2 className="text-xl font-bold tracking-tight text-foreground uppercase">{title}</h2>
+      <p className="text-base text-muted-foreground">{subtitle}</p>
+      <p className="text-sm text-muted-foreground">{currencyNote}</p>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/components/reports/ReportSection.tsx b/Frontend/erp-system/components/reports/ReportSection.tsx
new file mode 100644
index 0000000..f5d1aa4
--- /dev/null
+++ b/Frontend/erp-system/components/reports/ReportSection.tsx
@@ -0,0 +1,42 @@
+import { formatAmount } from "@/lib/format"
+import { Table, TableBody, TableCell, TableFooter, TableRow } from "@/components/ui/table"
+
+export interface ReportSectionLine {
+  label: React.ReactNode
+  amount: number
+}
+
+interface ReportSectionProps {
+  title: string
+  lines: ReportSectionLine[]
+  /** Omit to hide the total row entirely (e.g. a single-line section that would just repeat itself). */
+  total?: number
+}
+
+/** One bordered statement section: its lines, then an optional bold total row. Renders nothing when there are no lines. */
+export function ReportSection({ title, lines, total }: ReportSectionProps) {
+  if (lines.length === 0) return null
+  return (
+    <div className="mb-4 rounded-lg border p-4">
+      <p className="mb-2 text-sm font-semibold tracking-wide text-muted-foreground uppercase">{title}</p>
+      <Table className="text-base">
+        <TableBody>
+          {lines.map((line, i) => (
+            <TableRow key={i} className="border-0 hover:bg-transparent">
+              <TableCell className="px-0 py-1.5">{line.label}</TableCell>
+              <TableCell className="px-0 py-1.5 text-right tabular-nums">{formatAmount(line.amount)}</TableCell>
+            </TableRow>
+          ))}
+        </TableBody>
+        {total !== undefined && (
+          <TableFooter className="border-t bg-transparent">
+            <TableRow className="hover:bg-transparent">
+              <TableCell className="px-0 py-2 font-semibold">Total {title}</TableCell>
+              <TableCell className="px-0 py-2 text-right font-semibold tabular-nums">{formatAmount(total)}</TableCell>
+            </TableRow>
+          </TableFooter>
+        )}
+      </Table>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/components/reports/ReportSubtotal.tsx b/Frontend/erp-system/components/reports/ReportSubtotal.tsx
new file mode 100644
index 0000000..8da7d39
--- /dev/null
+++ b/Frontend/erp-system/components/reports/ReportSubtotal.tsx
@@ -0,0 +1,23 @@
+import { formatAmount } from "@/lib/format"
+import { cn } from "@/lib/utils"
+
+interface ReportSubtotalProps {
+  label: string
+  amount: number
+  large?: boolean
+}
+
+/** A bold, unbordered subtotal/total line (Gross Profit, Net Cash From Operations, the final total, etc.). */
+export function ReportSubtotal({ label, amount, large }: ReportSubtotalProps) {
+  return (
+    <div
+      className={cn(
+        "mb-4 flex items-center justify-between rounded-lg bg-muted/40 px-4 py-3 font-bold",
+        large && "text-lg"
+      )}
+    >
+      <span>{label}</span>
+      <span className="tabular-nums">{formatAmount(amount)}</span>
+    </div>
+  )
+}
diff --git a/Frontend/erp-system/components/sales/FreeIssuePromotionSuggestions.tsx b/Frontend/erp-system/components/sales/FreeIssuePromotionSuggestions.tsx
new file mode 100644
index 0000000..03d0387
--- /dev/null
+++ b/Frontend/erp-system/components/sales/FreeIssuePromotionSuggestions.tsx
@@ -0,0 +1,65 @@
+"use client"
+
+import Link from "next/link"
+import { Lightbulb, PackageCheck } from "lucide-react"
+
+import { buttonVariants } from "@/components/ui/button"
+import { cn } from "@/lib/utils"
+import { SalesFreeIssueSuggestion } from "@/types/sales"
+
+export function FreeIssuePromotionSuggestions({ suggestion }: { suggestion: SalesFreeIssueSuggestion | null }) {
+  if (!suggestion || suggestion.lines.length === 0) {
+    return (
+      <div className="rounded-2xl border border-dashed p-6 text-sm text-muted-foreground">
+        No free-issue promotion suggestions were generated for this slip yet.
+      </div>
+    )
+  }
+
+  return (
+    <div className="rounded-2xl border p-4">
+      <div className="mb-4 flex items-center justify-between gap-3">
+        <div>
+          <div className="inline-flex items-center gap-2 rounded-full bg-amber-500/10 px-3 py-1 text-xs font-semibold uppercase tracking-wide text-amber-700">
+            <Lightbulb className="size-3.5" />
+            Backend suggestion
+          </div>
+          <h2 className="mt-2 text-lg font-semibold text-foreground">Free-issue promotions</h2>
+          <p className="text-sm text-muted-foreground">The server suggests reward quantities and alternate products for this slip.</p>
+        </div>
+        <Link href="/dashboard/sales/free-issues/new" className={cn(buttonVariants({ variant: "outline", size: "sm" }))}>
+          Create free issue
+        </Link>
+      </div>
+
+      <div className="grid gap-4 lg:grid-cols-2">
+        {suggestion.lines.map((line) => (
+          <div key={line.salesSlipLineId} className="rounded-xl border bg-muted/20 p-4">
+            <div className="flex items-start justify-between gap-3">
+              <div>
+                <div className="font-medium text-foreground">{line.itemName}</div>
+                <div className="text-sm text-muted-foreground">{line.itemSku} • Qty {line.qty}</div>
+              </div>
+              <div className="rounded-full bg-primary/10 px-3 py-1 text-xs font-semibold text-primary">
+                Buy {line.triggerQty} get {line.suggestedFreeQty} free
+              </div>
+            </div>
+
+            <div className="mt-3 flex flex-wrap gap-2 text-sm">
+              {line.rewardOptions.map((option, index) => (
+                <span key={option.itemId} className={cn("inline-flex items-center gap-1 rounded-full border px-3 py-1", index === 0 && "border-primary bg-primary/5 text-primary") }>
+                  {index === 0 ? <PackageCheck className="size-3.5" /> : null}
+                  {option.name}
+                </span>
+              ))}
+            </div>
+
+            <div className="mt-3 text-sm text-muted-foreground">
+              Suggested free qty: <span className="font-medium text-foreground">{line.suggestedFreeQty.toFixed(2)}</span>
+            </div>
+          </div>
+        ))}
+      </div>
+    </div>
+  )
+}
\ No newline at end of file
diff --git a/Frontend/erp-system/components/sales/FreeIssueSuggestions.tsx b/Frontend/erp-system/components/sales/FreeIssueSuggestions.tsx
new file mode 100644
index 0000000..2813912
--- /dev/null
+++ b/Frontend/erp-system/components/sales/FreeIssueSuggestions.tsx
@@ -0,0 +1,42 @@
+"use client"
+
+import Link from "next/link"
+
+import { buttonVariants } from "@/components/ui/button"
+import { cn } from "@/lib/utils"
+import { SalesSlipSummary } from "@/types/sales"
+
+export function FreeIssueSuggestions({ rows }: { rows: SalesSlipSummary[] }) {
+  if (rows.length === 0) return null
+
+  return (
+    <div className="rounded-2xl border p-4">
+      <div className="mb-3 flex items-center justify-between gap-3">
+        <div>
+          <h2 className="text-lg font-semibold text-foreground">Free issue suggestions</h2>
+          <p className="text-sm text-muted-foreground">Recent free-issue slips created from the free-issues page.</p>
+        </div>
+        <Link href="/dashboard/sales/free-issues" className={cn(buttonVariants({ variant: "outline", size: "sm" }))}>
+          Open free issues
+        </Link>
+      </div>
+
+      <div className="grid gap-3 md:grid-cols-2 xl:grid-cols-3">
+        {rows.map((row) => (
+          <Link
+            key={row.salesSlipId}
+            href={`/dashboard/sales/free-issues/${row.salesSlipId}`}
+            className="rounded-xl border bg-muted/20 p-3 transition-colors hover:bg-muted/40"
+          >
+            <div className="flex items-center justify-between gap-2">
+              <div className="font-medium text-foreground">{row.slipNo}</div>
+              <div className="text-xs uppercase tracking-wide text-muted-foreground">{row.status}</div>
+            </div>
+            <div className="mt-1 text-sm text-muted-foreground">{row.customerSnapshotName}</div>
+            <div className="mt-2 text-sm text-foreground">Free qty total: {row.totals.freeQtyTotal.toFixed(2)}</div>
+          </Link>
+        ))}
+      </div>
+    </div>
+  )
+}
\ No newline at end of file
diff --git a/Frontend/erp-system/components/ui/alert-dialog.tsx b/Frontend/erp-system/components/ui/alert-dialog.tsx
index 315d66d..57d09dc 100644
--- a/Frontend/erp-system/components/ui/alert-dialog.tsx
+++ b/Frontend/erp-system/components/ui/alert-dialog.tsx
@@ -43,23 +43,23 @@ const variantConfig: Record<
 > = {
   info: {
     icon: InfoIcon,
-    iconClass: "text-sky-600 bg-sky-50",
-    ringClass: "ring-sky-100",
+    iconClass: "text-info bg-info/10",
+    ringClass: "ring-info/20",
   },
   warning: {
     icon: AlertTriangleIcon,
-    iconClass: "text-amber-600 bg-amber-50",
-    ringClass: "ring-amber-100",
+    iconClass: "text-warning bg-warning/10",
+    ringClass: "ring-warning/20",
   },
   destructive: {
     icon: XCircleIcon,
-    iconClass: "text-red-600 bg-red-50",
-    ringClass: "ring-red-100",
+    iconClass: "text-destructive bg-destructive/10",
+    ringClass: "ring-destructive/20",
   },
   success: {
     icon: CheckCircle2Icon,
-    iconClass: "text-emerald-600 bg-emerald-50",
-    ringClass: "ring-emerald-100",
+    iconClass: "text-success bg-success/10",
+    ringClass: "ring-success/20",
   },
 }
 
@@ -92,7 +92,7 @@ function AlertDialogContent({
       <AlertDialogPrimitive.Popup
         data-slot="alert-dialog-content"
         className={cn(
-          "fixed top-1/2 left-1/2 z-50 w-full max-w-[calc(100%-2rem)] -translate-x-1/2 -translate-y-1/2 rounded-2xl bg-white p-6 shadow-xl ring-1 duration-150 outline-none sm:max-w-sm",
+          "fixed top-1/2 left-1/2 z-50 w-full max-w-[calc(100%-2rem)] -translate-x-1/2 -translate-y-1/2 rounded-2xl bg-popover p-6 shadow-xl ring-1 duration-150 outline-none sm:max-w-sm",
           "data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
           ringClass,
           className
@@ -105,11 +105,11 @@ function AlertDialogContent({
           </div>
 
           <div className="flex flex-col gap-1.5">
-            <AlertDialogPrimitive.Title className="text-base font-bold text-slate-900">
+            <AlertDialogPrimitive.Title className="text-base font-bold text-foreground">
               {title}
             </AlertDialogPrimitive.Title>
             {description && (
-              <AlertDialogPrimitive.Description className="text-sm text-slate-500">
+              <AlertDialogPrimitive.Description className="text-sm text-muted-foreground">
                 {description}
               </AlertDialogPrimitive.Description>
             )}
diff --git a/Frontend/erp-system/lib/api/bundles.ts b/Frontend/erp-system/lib/api/bundles.ts
new file mode 100644
index 0000000..9400d3f
--- /dev/null
+++ b/Frontend/erp-system/lib/api/bundles.ts
@@ -0,0 +1,49 @@
+import { apiRequest, buildQuery } from "@/lib/api-client"
+import { PagedResponse } from "@/types/common"
+import {
+  BundleSale,
+  BundleSalePostingCheck,
+  BundleSaleSummary,
+  BundleSaleTemplate,
+  BundleSaleTemplateSummary,
+  CreateBundleSaleRequest,
+  UpdateBundleSaleRequest,
+} from "@/types/bundles"
+
+export const bundleApi = {
+  listBundles(params: { page?: number; pageSize?: number; status?: string; customerId?: number; warehouseId?: number; q?: string } = {}): Promise<PagedResponse<BundleSaleSummary>> {
+    return apiRequest<PagedResponse<BundleSaleSummary>>(`/bundle-sales${buildQuery(params)}`)
+  },
+
+  getBundle(bundleSaleId: number): Promise<BundleSale> {
+    return apiRequest<BundleSale>(`/bundle-sales/${bundleSaleId}`)
+  },
+
+  createBundle(request: CreateBundleSaleRequest): Promise<BundleSale> {
+    return apiRequest<BundleSale>("/bundle-sales", { method: "POST", body: request })
+  },
+
+  updateBundle(bundleSaleId: number, request: UpdateBundleSaleRequest): Promise<BundleSale> {
+    return apiRequest<BundleSale>(`/bundle-sales/${bundleSaleId}`, { method: "PUT", body: request })
+  },
+
+  postBundle(bundleSaleId: number): Promise<BundleSale> {
+    return apiRequest<BundleSale>(`/bundle-sales/${bundleSaleId}/post`, { method: "POST" })
+  },
+
+  cancelBundle(bundleSaleId: number): Promise<BundleSale> {
+    return apiRequest<BundleSale>(`/bundle-sales/${bundleSaleId}/cancel`, { method: "POST" })
+  },
+
+  checkBundlePosting(bundleSaleId: number): Promise<BundleSalePostingCheck> {
+    return apiRequest<BundleSalePostingCheck>(`/bundle-sales/${bundleSaleId}/posting-check`)
+  },
+
+  listTemplates(params: { page?: number; pageSize?: number; q?: string } = {}): Promise<PagedResponse<BundleSaleTemplateSummary>> {
+    return apiRequest<PagedResponse<BundleSaleTemplateSummary>>(`/bundle-sales/templates${buildQuery(params)}`)
+  },
+
+  getTemplate(bundleSaleTemplateId: number): Promise<BundleSaleTemplate> {
+    return apiRequest<BundleSaleTemplate>(`/bundle-sales/templates/${bundleSaleTemplateId}`)
+  },
+}
diff --git a/Frontend/erp-system/lib/api/customers.ts b/Frontend/erp-system/lib/api/customers.ts
new file mode 100644
index 0000000..eaeabb9
--- /dev/null
+++ b/Frontend/erp-system/lib/api/customers.ts
@@ -0,0 +1,15 @@
+import { apiRequest, buildQuery } from "@/lib/api-client"
+import { PagedResponse } from "@/types/common"
+import { Customer } from "@/types/customers"
+
+export interface ListCustomersParams {
+  page?: number
+  pageSize?: number
+  q?: string
+}
+
+export const customersApi = {
+  list(params: ListCustomersParams = {}): Promise<PagedResponse<Customer>> {
+    return apiRequest<PagedResponse<Customer>>(`/customers${buildQuery(params)}`)
+  },
+}
diff --git a/Frontend/erp-system/lib/api/general-ledger.ts b/Frontend/erp-system/lib/api/general-ledger.ts
new file mode 100644
index 0000000..c7948a9
--- /dev/null
+++ b/Frontend/erp-system/lib/api/general-ledger.ts
@@ -0,0 +1,322 @@
+// Client for the external General Ledger service, reached through ERPCore's generic
+// reverse-proxy at /api/v1/gl/* (docs/12-GENERAL-LEDGER-INTEGRATION.md). Deliberately NOT
+// built on lib/api-client.ts's apiRequest/apiRequestWithETag: those assume ERPCore's own
+// RFC 7807 ProblemDetails error shape and a bare-DTO success body. GL wraps every response
+// (success AND error) in its own `{ statusCode, success, message, data }` envelope instead,
+// and — a documented GL quirk — success bodies are camelCase while error bodies are
+// PascalCase, so this module unwraps both forms itself rather than trusting one casing.
+import {
+  CashAccountType,
+  CashAndBankAccountDto,
+  CashBankAccountType,
+  CreateBankAccountRequest,
+  CreateCashAccountRequest,
+  CreateCashOrBankAccountResponse,
+  GlAccountListResult,
+  GlBudget,
+  GlFilePayload,
+  ReportOutputFormat,
+  ReportType,
+  TrialBalanceRow,
+  BalanceSheetResponse,
+  GeneralLedgerRow,
+  ProfitAndLossResponse,
+  CashFlowResponse,
+  BudgetVsActualRow,
+  TaxSummaryResponse,
+  TaxSummaryParams,
+  GlPagedResult,
+  ChequeBook,
+  ChequeBookStatus,
+  ChequePage,
+  CreateChequeBookRequest,
+  IssueChequePageRequest,
+  UpdateChequePageStatusRequest,
+  ReceivedCheque,
+  ReceivedChequeStatus,
+  ReceivedFromType,
+  CreateReceivedChequeRequest,
+  UpdateReceivedChequeStatusRequest,
+} from "@/types/general-ledger"
+
+const GL_BASE = "/api/v1/gl"
+
+/** Duck-type compatible with lib/error-map.ts's ApiErrorLike — `detail` carries GL's own message. */
+export class GlApiError extends Error {
+  status: number
+  detail: string
+
+  constructor(status: number, message: string) {
+    super(message)
+    this.status = status
+    this.detail = message
+  }
+}
+
+interface GlEnvelope<T> {
+  statusCode?: number
+  StatusCode?: number
+  success?: boolean
+  Success?: boolean
+  message?: string
+  Message?: string
+  data?: T
+  Data?: T
+  // Surfaces only when the proxy itself fails before reaching GL (e.g. ERPCore's own
+  // 503 GL_SERVICE_UNAVAILABLE ProblemDetails) rather than GL's own envelope.
+  title?: string
+  detail?: string
+}
+
+type GlQueryValue = string | number | undefined
+
+async function glRequest<T>(
+  path: string,
+  options: { method?: string; query?: Record<string, GlQueryValue>; body?: unknown } = {}
+): Promise<T> {
+  const { method = "GET", query, body } = options
+  const search = new URLSearchParams()
+  if (query) {
+    for (const [key, value] of Object.entries(query)) {
+      if (value === undefined || value === "") continue
+      search.set(key, String(value))
+    }
+  }
+  const qs = search.toString()
+
+  const response = await fetch(`${GL_BASE}${path}${qs ? `?${qs}` : ""}`, {
+    method,
+    credentials: "include", // the proxy is ErpAccess-gated, same as every other v1 endpoint
+    headers: {
+      Accept: "application/json",
+      ...(body !== undefined ? { "Content-Type": "application/json" } : {}),
+    },
+    body: body !== undefined ? JSON.stringify(body) : undefined,
+  })
+
+  let envelope: GlEnvelope<T> | null = null
+  try {
+    envelope = (await response.json()) as GlEnvelope<T>
+  } catch {
+    // Non-JSON body — e.g. an unreachable proxy hop. Falls through to the generic message below.
+  }
+
+  const success = envelope?.success ?? envelope?.Success ?? false
+  if (!response.ok || !success) {
+    const message =
+      envelope?.message ?? envelope?.Message ?? envelope?.detail ?? envelope?.title ??
+      response.statusText ?? "General Ledger service request failed"
+    throw new GlApiError(response.status, message)
+  }
+
+  return (envelope?.data ?? envelope?.Data) as T
+}
+
+/** Decodes a base64 payload and triggers a browser download — no server round-trip needed. */
+function downloadBase64File(base64: string, fileName: string, contentType: string) {
+  const byteChars = atob(base64)
+  const byteNumbers = new Array(byteChars.length)
+  for (let i = 0; i < byteChars.length; i++) byteNumbers[i] = byteChars.charCodeAt(i)
+  const blob = new Blob([new Uint8Array(byteNumbers)], { type: contentType })
+  const url = URL.createObjectURL(blob)
+  const link = document.createElement("a")
+  link.href = url
+  link.download = fileName
+  document.body.appendChild(link)
+  link.click()
+  document.body.removeChild(link)
+  URL.revokeObjectURL(url)
+}
+
+/** Shared by downloadPdf/downloadCsv — same report call, only `outputFormat` differs. */
+async function downloadReportFile(
+  reportType: ReportType,
+  outputFormat: ReportOutputFormat.Pdf | ReportOutputFormat.Csv,
+  params: Record<string, GlQueryValue>
+): Promise<void> {
+  const payload = await glRequest<GlFilePayload>("/reports", {
+    query: { reportType, outputFormat, ...params },
+  })
+  downloadBase64File(payload.contentBase64, payload.fileName, payload.contentType)
+}
+
+export const reportsApi = {
+  trialBalance(asOfDate: string) {
+    return glRequest<TrialBalanceRow[]>("/reports", {
+      query: { reportType: ReportType.TrialBalance, outputFormat: ReportOutputFormat.Json, asOfDate },
+    })
+  },
+
+  /** Confirmed classified-statement shape (2026-07-31 rework) — see types/general-ledger.ts's BalanceSheetResponse note. */
+  balanceSheet(asOfDate: string) {
+    return glRequest<BalanceSheetResponse>("/reports", {
+      query: { reportType: ReportType.BalanceSheet, outputFormat: ReportOutputFormat.Json, asOfDate },
+    })
+  },
+
+  // GL's `accountCode` param is optional (renamed from `accountId` in GL's 2026-07-22 revision,
+  // CLAUDE.md Rule 8.2 on GL's side — behavior unchanged): omitted, this returns the true General
+  // Ledger — every postable account's own transactions together, each with its own running
+  // balance (resets per account), sorted by accountCode then entryDate. Supplying accountCode
+  // switches to "Account Ledger" mode (one account + its descendants, one running balance) — not
+  // used by this page; add it back with an accountCode param if a single-account view is needed later.
+  generalLedger(periodStart: string, periodEnd: string) {
+    return glRequest<GeneralLedgerRow[]>("/reports", {
+      query: { reportType: ReportType.GeneralLedger, outputFormat: ReportOutputFormat.Json, periodStart, periodEnd },
+    })
+  },
+
+  /** Nested-sections shape as of the 2026-07-22 rework — see types/general-ledger.ts's ProfitAndLossResponse note. */
+  profitAndLoss(periodStart: string, periodEnd: string) {
+    return glRequest<ProfitAndLossResponse>("/reports", {
+      query: { reportType: ReportType.ProfitAndLoss, outputFormat: ReportOutputFormat.Json, periodStart, periodEnd },
+    })
+  },
+
+  /** Confirmed structured-statement shape (2026-07-22 rework) — see types/general-ledger.ts's CashFlowResponse note; everything nests under `operatingActivities`. */
+  cashFlow(periodStart: string, periodEnd: string) {
+    return glRequest<CashFlowResponse>("/reports", {
+      query: { reportType: ReportType.CashFlow, outputFormat: ReportOutputFormat.Json, periodStart, periodEnd },
+    })
+  },
+
+  budgetVsActual(budgetId: number) {
+    return glRequest<BudgetVsActualRow[]>("/reports", {
+      query: { reportType: ReportType.BudgetVsActual, outputFormat: ReportOutputFormat.Json, budgetId },
+    })
+  },
+
+  /** Income Tax Computation — new report (2026-07-22). Optional params get no client-side default; an untouched field sends nothing, letting GL's own server-side defaulting be the single source of truth. */
+  taxSummary(params: TaxSummaryParams) {
+    return glRequest<TaxSummaryResponse>("/reports", {
+      query: { reportType: ReportType.TaxSummary, outputFormat: ReportOutputFormat.Json, ...params },
+    })
+  },
+
+  /** Same report call as the Json variants above, only `outputFormat` differs — the PDF bytes come from the same endpoint. */
+  downloadPdf(reportType: ReportType, params: Record<string, GlQueryValue>): Promise<void> {
+    return downloadReportFile(reportType, ReportOutputFormat.Pdf, params)
+  },
+
+  /** Same mechanism as downloadPdf, `outputFormat=Csv` — GL's bytes are downloaded unmodified, not reshaped/reformatted client-side. */
+  downloadCsv(reportType: ReportType, params: Record<string, GlQueryValue>): Promise<void> {
+    return downloadReportFile(reportType, ReportOutputFormat.Csv, params)
+  },
+}
+
+/**
+ * Chart of Accounts — used by the Cash/Bank Accounts list page to resolve each row's `glAccountId`
+ * into a readable account code/name (retrofit 2026-07-31: the create form no longer needs this at
+ * all, since `glAccountCode` was removed from the create request — the GL account is auto-created).
+ * The General Ledger **report** page deliberately does NOT use this: it always calls the report in
+ * full-ledger mode (no `accountCode`), so every account's code/name shown come from the report's own
+ * rows (`GeneralLedgerRow.accountCode`/`accountName`), not a separate `/accounts` call — see
+ * docs/21-GENERAL-LEDGER-FRONTEND.md.
+ */
+export const glAccountsApi = {
+  list(): Promise<GlAccountListResult> {
+    return glRequest<GlAccountListResult>("/accounts")
+  },
+}
+
+/** Used only to populate the Budget vs Actual report's budget picker. */
+export const glBudgetsApi = {
+  list(): Promise<GlBudget[]> {
+    return glRequest<GlBudget[]>("/budgets")
+  },
+}
+
+export const bankAccountsApi = {
+  /** GL's own server-side union of both tables (2026-07-22 rework) — `accountType` narrows which table(s) contribute rows; client-side filters still layer on top. */
+  list(accountType?: CashBankAccountType | "Both"): Promise<CashAndBankAccountDto[]> {
+    return glRequest<CashAndBankAccountDto[]>("/bank-accounts", { query: { accountType } })
+  },
+
+  createBank(request: CreateBankAccountRequest): Promise<CreateCashOrBankAccountResponse> {
+    return glRequest<CreateCashOrBankAccountResponse>("/bank-accounts", { method: "POST", body: request })
+  },
+
+  createCash(request: CreateCashAccountRequest): Promise<CreateCashOrBankAccountResponse> {
+    return glRequest<CreateCashOrBankAccountResponse>("/cash-accounts", { method: "POST", body: request })
+  },
+
+  // No get()/update(): GL exposes no GET/PUT by id for either bank_account or cash_account today
+  // (see docs/21-GENERAL-LEDGER-FRONTEND.md's "Known gap — edit").
+}
+
+/** Feeds the Cash/Bank create form's Cash Account Type picker; a name with no match creates a new type on the fly server-side (nothing to pre-create from this list). */
+export const cashAccountTypesApi = {
+  list(): Promise<CashAccountType[]> {
+    return glRequest<CashAccountType[]>("/cash-account-types")
+  },
+}
+
+/**
+ * Cheque Books/Pages — cheques issued from this company's own cheque books (Cheque Management
+ * module, added to GL 2026-07-30). `chequeBookNo` is the identifying value GL uses in its own
+ * routes, not a numeric id. No `list()`/`get()` for pages standalone — a book's pages are always
+ * read via `get(chequeBookNo, true)`'s `pages[]`, which is the only place this frontend needs them.
+ */
+export const chequeBooksApi = {
+  list(params?: {
+    bankAccountId?: number
+    branchId?: number
+    status?: ChequeBookStatus
+    page?: number
+    pageSize?: number
+  }): Promise<GlPagedResult<ChequeBook>> {
+    return glRequest<GlPagedResult<ChequeBook>>("/cheque-books", { query: { ...params } })
+  },
+
+  /** `expandPages` maps to GL's `?expand=pages` — omit it for just the book's own fields. */
+  get(chequeBookNo: string, expandPages = false): Promise<ChequeBook> {
+    return glRequest<ChequeBook>(`/cheque-books/${encodeURIComponent(chequeBookNo)}`, {
+      query: expandPages ? { expand: "pages" } : undefined,
+    })
+  },
+
+  /** Auto-generates every leaf (`totalLeaves` `ChequePage` rows, all `Unused`) in the same call — the response's `pages[]` already has them. */
+  create(request: CreateChequeBookRequest): Promise<ChequeBook> {
+    return glRequest<ChequeBook>("/cheque-books", { method: "POST", body: request })
+  },
+}
+
+export const chequePagesApi = {
+  issue(chequeNo: string, request: IssueChequePageRequest): Promise<ChequePage> {
+    return glRequest<ChequePage>(`/cheque-pages/${encodeURIComponent(chequeNo)}/issue`, {
+      method: "PUT",
+      body: request,
+    })
+  },
+
+  /** `Clear`/`Bounce`/`Cancel`/`Void` — only valid from certain `issueStatus` values, see `types/general-ledger.ts`'s `ChequePageStatusAction`. */
+  updateStatus(chequeNo: string, request: UpdateChequePageStatusRequest): Promise<ChequePage> {
+    return glRequest<ChequePage>(`/cheque-pages/${encodeURIComponent(chequeNo)}/status`, {
+      method: "PUT",
+      body: request,
+    })
+  },
+}
+
+/** Received Cheques — cheques received from customers/suppliers/others, deliberately unlinked to any `ChequeBook`. */
+export const receivedChequesApi = {
+  list(params?: {
+    companyId?: number
+    branchId?: number
+    status?: ReceivedChequeStatus
+    receivedFromType?: ReceivedFromType
+    page?: number
+    pageSize?: number
+  }): Promise<GlPagedResult<ReceivedCheque>> {
+    return glRequest<GlPagedResult<ReceivedCheque>>("/received-cheques", { query: { ...params } })
+  },
+
+  create(request: CreateReceivedChequeRequest): Promise<ReceivedCheque> {
+    return glRequest<ReceivedCheque>("/received-cheques", { method: "POST", body: request })
+  },
+
+  /** `Deposit`/`Clear`/`Return`/`Cancel` — only valid from certain statuses, see `types/general-ledger.ts`'s `ReceivedChequeStatusAction`. */
+  updateStatus(id: number, request: UpdateReceivedChequeStatusRequest): Promise<ReceivedCheque> {
+    return glRequest<ReceivedCheque>(`/received-cheques/${id}/status`, { method: "PUT", body: request })
+  },
+}
diff --git a/Frontend/erp-system/lib/api/sales.ts b/Frontend/erp-system/lib/api/sales.ts
new file mode 100644
index 0000000..fa8a9c3
--- /dev/null
+++ b/Frontend/erp-system/lib/api/sales.ts
@@ -0,0 +1,139 @@
+import { apiRequest, apiRequestWithETag, buildQuery } from "@/lib/api-client"
+import { ApiResult, PagedResponse } from "@/types/common"
+import {
+  CreateSalesInvoiceRequest,
+  CreateSalesSlipRequest,
+  SalesInvoice,
+  SalesInvoiceStatus,
+  SalesInvoicePostingCheck,
+  SalesInvoiceSummary,
+  SalesListFilterParams,
+  SalesReportDefinition,
+  SalesReportQueryRequest,
+  SalesReportQueryResponse,
+  SalesFreeIssueSuggestion,
+  FreeIssueDetail,
+  FreeIssueSummary,
+  SalesSlip,
+  SalesSlipStatus,
+  SalesSlipPostingCheck,
+  SalesSlipSummary,
+  UpdateSalesInvoiceRequest,
+  UpdateSalesSlipRequest,
+} from "@/types/sales"
+
+type SalesReportId = string
+
+export interface ListSalesInvoicesParams extends SalesListFilterParams {
+  status?: SalesInvoiceStatus
+}
+
+export interface ListSalesSlipsParams extends SalesListFilterParams {
+  status?: SalesSlipStatus
+}
+
+export interface ListFreeIssuesParams extends SalesListFilterParams {
+  status?: SalesSlipStatus
+}
+
+export const salesApi = {
+  listInvoices(params: ListSalesInvoicesParams = {}): Promise<PagedResponse<SalesInvoiceSummary>> {
+    return apiRequest<PagedResponse<SalesInvoiceSummary>>(`/sales-invoices${buildQuery(params)}`)
+  },
+
+  getInvoice(salesInvoiceId: number): Promise<ApiResult<SalesInvoice>> {
+    return apiRequestWithETag<SalesInvoice>(`/sales-invoices/${salesInvoiceId}`)
+  },
+
+  createInvoice(request: CreateSalesInvoiceRequest): Promise<ApiResult<SalesInvoice>> {
+    return apiRequestWithETag<SalesInvoice>("/sales-invoices", { method: "POST", body: request })
+  },
+
+  updateInvoice(salesInvoiceId: number, request: UpdateSalesInvoiceRequest, ifMatch: string): Promise<ApiResult<SalesInvoice>> {
+    return apiRequestWithETag<SalesInvoice>(`/sales-invoices/${salesInvoiceId}`, { method: "PUT", body: request, ifMatch })
+  },
+
+  postInvoice(salesInvoiceId: number): Promise<SalesInvoice> {
+    return apiRequest<SalesInvoice>(`/sales-invoices/${salesInvoiceId}/post`, { method: "POST" })
+  },
+
+  checkInvoicePosting(salesInvoiceId: number): Promise<SalesInvoicePostingCheck> {
+    return apiRequest<SalesInvoicePostingCheck>(`/sales-invoices/${salesInvoiceId}/posting-check`)
+  },
+
+  cancelInvoice(salesInvoiceId: number): Promise<SalesInvoice> {
+    return apiRequest<SalesInvoice>(`/sales-invoices/${salesInvoiceId}/cancel`, { method: "POST" })
+  },
+
+  listSlips(params: ListSalesSlipsParams = {}): Promise<PagedResponse<SalesSlipSummary>> {
+    return apiRequest<PagedResponse<SalesSlipSummary>>(`/sales-slips${buildQuery(params)}`)
+  },
+
+  getSlip(salesSlipId: number): Promise<ApiResult<SalesSlip>> {
+    return apiRequestWithETag<SalesSlip>(`/sales-slips/${salesSlipId}`)
+  },
+
+  createSlip(request: CreateSalesSlipRequest): Promise<ApiResult<SalesSlip>> {
+    return apiRequestWithETag<SalesSlip>("/sales-slips", { method: "POST", body: request })
+  },
+
+  updateSlip(salesSlipId: number, request: UpdateSalesSlipRequest, ifMatch: string): Promise<ApiResult<SalesSlip>> {
+    return apiRequestWithETag<SalesSlip>(`/sales-slips/${salesSlipId}`, { method: "PUT", body: request, ifMatch })
+  },
+
+  postSlip(salesSlipId: number): Promise<SalesSlip> {
+    return apiRequest<SalesSlip>(`/sales-slips/${salesSlipId}/post`, { method: "POST" })
+  },
+
+  checkSlipPosting(salesSlipId: number): Promise<SalesSlipPostingCheck> {
+    return apiRequest<SalesSlipPostingCheck>(`/sales-slips/${salesSlipId}/posting-check`)
+  },
+
+  cancelSlip(salesSlipId: number): Promise<SalesSlip> {
+    return apiRequest<SalesSlip>(`/sales-slips/${salesSlipId}/cancel`, { method: "POST" })
+  },
+
+  listFreeIssues(params: ListFreeIssuesParams = {}): Promise<PagedResponse<FreeIssueSummary>> {
+    return apiRequest<PagedResponse<FreeIssueSummary>>(`/free-issues${buildQuery(params)}`)
+  },
+
+  getFreeIssue(freeIssueId: number): Promise<ApiResult<FreeIssueDetail>> {
+    return apiRequestWithETag<FreeIssueDetail>(`/free-issues/${freeIssueId}`)
+  },
+
+  createFreeIssue(request: CreateSalesSlipRequest): Promise<ApiResult<FreeIssueDetail>> {
+    return apiRequestWithETag<FreeIssueDetail>("/free-issues", { method: "POST", body: request })
+  },
+
+  updateFreeIssue(freeIssueId: number, request: UpdateSalesSlipRequest, ifMatch: string): Promise<ApiResult<FreeIssueDetail>> {
+    return apiRequestWithETag<FreeIssueDetail>(`/free-issues/${freeIssueId}`, { method: "PUT", body: request, ifMatch })
+  },
+
+  postFreeIssue(freeIssueId: number): Promise<FreeIssueDetail> {
+    return apiRequest<FreeIssueDetail>(`/free-issues/${freeIssueId}/post`, { method: "POST" })
+  },
+
+  checkFreeIssuePosting(freeIssueId: number): Promise<SalesSlipPostingCheck> {
+    return apiRequest<SalesSlipPostingCheck>(`/free-issues/${freeIssueId}/posting-check`)
+  },
+
+  cancelFreeIssue(freeIssueId: number): Promise<FreeIssueDetail> {
+    return apiRequest<FreeIssueDetail>(`/free-issues/${freeIssueId}/cancel`, { method: "POST" })
+  },
+
+  getFreeIssueSuggestions(salesSlipId: number): Promise<SalesFreeIssueSuggestion> {
+    return apiRequest<SalesFreeIssueSuggestion>(`/sales-slips/${salesSlipId}/free-issue-suggestions`)
+  },
+
+  listReports(): Promise<SalesReportDefinition[]> {
+    return apiRequest<SalesReportDefinition[]>("/reports/sales")
+  },
+
+  getReport(reportId: SalesReportId): Promise<SalesReportDefinition> {
+    return apiRequest<SalesReportDefinition>(`/reports/sales/${reportId}`)
+  },
+
+  queryReport(request: SalesReportQueryRequest): Promise<SalesReportQueryResponse> {
+    return apiRequest<SalesReportQueryResponse>("/reports/sales/query", { method: "POST", body: request })
+  },
+}
diff --git a/Frontend/erp-system/lib/format.ts b/Frontend/erp-system/lib/format.ts
new file mode 100644
index 0000000..28e9275
--- /dev/null
+++ b/Frontend/erp-system/lib/format.ts
@@ -0,0 +1,35 @@
+// Formatting helpers for statutory-style financial reports (docs/21-GENERAL-LEDGER-FRONTEND.md) —
+// comma-grouped thousands, fixed 2 decimals, negatives in parentheses (standard financial-statement
+// convention), rather than the plain `.toFixed(2)` used by the inventory-side stock screens.
+
+const AMOUNT_FORMATTER = new Intl.NumberFormat("en-US", {
+  minimumFractionDigits: 2,
+  maximumFractionDigits: 2,
+})
+
+/** `1234.5` -> "1,234.50"; `-1234.5` -> "(1,234.50)"; `0`/`null`/`undefined` -> the given fallback. */
+export function formatAmount(value: number | null | undefined, zeroDash = false): string {
+  if (value === null || value === undefined || Number.isNaN(value)) return "—"
+  if (zeroDash && value === 0) return "—"
+  const formatted = AMOUNT_FORMATTER.format(Math.abs(value))
+  return value < 0 ? `(${formatted})` : formatted
+}
+
+/** `"2026-07-01"` / an ISO timestamp -> "01 Jul 2026" for report headers and tables. */
+export function formatReportDate(value: string | null | undefined): string {
+  if (!value) return "—"
+  const date = new Date(value)
+  if (Number.isNaN(date.getTime())) return value
+  return date.toLocaleDateString("en-GB", { day: "2-digit", month: "short", year: "numeric" })
+}
+
+/** Today's date as `YYYY-MM-DD`, for default report filter values. */
+export function todayIso(): string {
+  return new Date().toISOString().slice(0, 10)
+}
+
+/** The first day of the current month as `YYYY-MM-DD`, for default period-start filter values. */
+export function startOfMonthIso(): string {
+  const now = new Date()
+  return new Date(now.getFullYear(), now.getMonth(), 1).toISOString().slice(0, 10)
+}
diff --git a/Frontend/erp-system/lib/sales-line-utils.ts b/Frontend/erp-system/lib/sales-line-utils.ts
new file mode 100644
index 0000000..5037f43
--- /dev/null
+++ b/Frontend/erp-system/lib/sales-line-utils.ts
@@ -0,0 +1,6 @@
+import { ItemListItem } from "@/types/master-data"
+
+export function getSuggestedUnitPrice(items: ItemListItem[], itemId: number | null | undefined): number | null {
+  if (!itemId) return null
+  return items.find((item) => item.itemId === itemId)?.salePrice ?? null
+}
\ No newline at end of file
diff --git a/Frontend/erp-system/lib/validations/general-ledger.ts b/Frontend/erp-system/lib/validations/general-ledger.ts
new file mode 100644
index 0000000..7420f32
--- /dev/null
+++ b/Frontend/erp-system/lib/validations/general-ledger.ts
@@ -0,0 +1,55 @@
+// Client-side UX validation only (docs/20-FRONTEND.md §3.1) — required fields the browser
+// already knows about. Everything else is server-authoritative and surfaced via the GL
+// service's own error message (lib/error-map.ts).
+
+export function validateBankAccountForm(input: { accountName: string }): Record<string, string> {
+  const errors: Record<string, string> = {}
+  if (!input.accountName.trim()) errors.accountName = "Account name is required"
+  return errors
+}
+
+export function validateChequeBookForm(input: {
+  branchId: string
+  bankAccountId: string
+  chequeBookNo: string
+  startChequeNo: string
+  endChequeNo: string
+  totalLeaves: string
+  receivedDate: string
+}): Record<string, string> {
+  const errors: Record<string, string> = {}
+  if (!input.branchId.trim()) errors.branchId = "Branch ID is required"
+  if (!input.bankAccountId) errors.bankAccountId = "Select a bank account"
+  if (!input.chequeBookNo.trim()) errors.chequeBookNo = "Cheque book number is required"
+  if (!input.startChequeNo.trim()) errors.startChequeNo = "Start cheque number is required"
+  if (!input.endChequeNo.trim()) errors.endChequeNo = "End cheque number is required"
+  if (!input.totalLeaves.trim()) errors.totalLeaves = "Total leaves is required"
+  if (!input.receivedDate) errors.receivedDate = "Received date is required"
+  return errors
+}
+
+export function validateIssueChequeForm(input: { payeeName: string; issueDate: string; amount: string }): Record<string, string> {
+  const errors: Record<string, string> = {}
+  if (!input.payeeName.trim()) errors.payeeName = "Payee name is required"
+  if (!input.issueDate) errors.issueDate = "Issue date is required"
+  if (!input.amount.trim() || Number(input.amount) <= 0) errors.amount = "Amount must be greater than 0"
+  return errors
+}
+
+export function validateReceivedChequeForm(input: {
+  companyId: string
+  receivedFromName: string
+  chequeNo: string
+  chequeDate: string
+  amount: string
+  receivedDate: string
+}): Record<string, string> {
+  const errors: Record<string, string> = {}
+  if (!input.companyId.trim()) errors.companyId = "Company ID is required"
+  if (!input.receivedFromName.trim()) errors.receivedFromName = "Received-from name is required"
+  if (!input.chequeNo.trim()) errors.chequeNo = "Cheque number is required"
+  if (!input.chequeDate) errors.chequeDate = "Cheque date is required"
+  if (!input.amount.trim() || Number(input.amount) <= 0) errors.amount = "Amount must be greater than 0"
+  if (!input.receivedDate) errors.receivedDate = "Received date is required"
+  return errors
+}
diff --git a/Frontend/erp-system/lib/vendor-code.ts b/Frontend/erp-system/lib/vendor-code.ts
new file mode 100644
index 0000000..9908f8d
--- /dev/null
+++ b/Frontend/erp-system/lib/vendor-code.ts
@@ -0,0 +1,18 @@
+/** First word of the name, uppercased and stripped to alphanumerics — falls back to "VN"
+ * so an empty/punctuation-only name still yields a usable base. Mirrors the warehouse
+ * code generator (app/dashboard/warehouse/page.tsx). */
+function vendorCodeBase(name: string): string {
+  const firstWord = name.trim().split(/\s+/)[0] ?? ""
+  const cleaned = firstWord.toUpperCase().replace(/[^A-Z0-9]/g, "")
+  return cleaned.slice(0, 10) || "VN"
+}
+
+/** Appends a numeric suffix until the code doesn't collide with an existing one — the
+ * backend enforces global uniqueness (409 on conflict) but has no generation of its own. */
+export function generateVendorCode(name: string, existingCodes: string[]): string {
+  const base = `VN-${vendorCodeBase(name)}`
+  if (!existingCodes.includes(base)) return base
+  let suffix = 2
+  while (existingCodes.includes(`${base}${suffix}`)) suffix += 1
+  return `${base}${suffix}`
+}
diff --git a/Frontend/erp-system/types/bundles.ts b/Frontend/erp-system/types/bundles.ts
new file mode 100644
index 0000000..d5d8ae7
--- /dev/null
+++ b/Frontend/erp-system/types/bundles.ts
@@ -0,0 +1,114 @@
+import { EntityStatus } from "@/types/common"
+
+export type BundleSaleStatus = "Draft" | "Posted" | "Cancelled"
+
+export interface BundleSaleTemplateLine {
+  bundleSaleTemplateLineId: number
+  itemId: number
+  uomId: number
+  warehouseId: number
+  qty: number
+  unitPrice: number
+  includeInBundle: boolean
+  sortOrder: number
+}
+
+export interface BundleSaleTemplateSummary {
+  bundleSaleTemplateId: number
+  templateCode: string
+  templateName: string
+  description: string | null
+  status: EntityStatus
+  lineCount: number
+  createdAt: string
+  updatedAt: string | null
+}
+
+export interface BundleSaleTemplate {
+  bundleSaleTemplateId: number
+  templateCode: string
+  templateName: string
+  description: string | null
+  status: EntityStatus
+  createdAt: string
+  updatedAt: string | null
+  lines: BundleSaleTemplateLine[]
+}
+
+export interface BundleSaleLine {
+  bundleSaleLineId: number
+  itemId: number
+  description: string
+  qty: number
+  uomId: number
+  warehouseId: number
+  unitPrice: number
+  lineTotal: number
+  includeInBundle: boolean
+  isComponent: boolean
+  parentLineId: number | null
+}
+
+export interface BundleSaleTotals {
+  componentSubtotal: number
+  bundlePrice: number
+  marginAmount: number
+  discountTotal: number
+  taxTotal: number
+  grandTotal: number
+}
+
+export interface BundleSaleSummary {
+  bundleSaleId: number
+  bundleNo: string
+  bundleDate: string
+  customerId: number
+  customerSnapshotName: string
+  warehouseId: number
+  bundleName: string
+  bundleCode: string
+  status: BundleSaleStatus
+  componentSubtotal: number
+  bundlePrice: number
+  grandTotal: number
+  createdAt: string
+}
+
+export interface BundleSale extends BundleSaleSummary, BundleSaleTotals {
+  cashierUserId: number
+  bundleSaleTemplateId: number
+  updatedAt: string | null
+  lines: BundleSaleLine[]
+}
+
+export interface BundleSalePostingIssue {
+  bundleSaleLineId: number
+  itemId: number
+  itemSku: string
+  itemName: string
+  warehouseId: number
+  requestedQty: number
+  availableQty: number
+  shortQty: number
+}
+
+export interface BundleSalePostingCheck {
+  bundleSaleId: number
+  bundleNo: string
+  status: BundleSaleStatus
+  canPost: boolean
+  issues: BundleSalePostingIssue[]
+}
+
+export interface CreateBundleSaleRequest {
+  customerId: number
+  warehouseId: number
+  cashierUserId: number
+  bundleSaleTemplateId: number
+  bundleName: string
+  bundlePrice: number
+  allowPriceOverride: boolean
+  lines: BundleSaleTemplateLine[]
+}
+
+export type UpdateBundleSaleRequest = CreateBundleSaleRequest
diff --git a/Frontend/erp-system/types/customers.ts b/Frontend/erp-system/types/customers.ts
new file mode 100644
index 0000000..a11afdc
--- /dev/null
+++ b/Frontend/erp-system/types/customers.ts
@@ -0,0 +1,24 @@
+import { EntityStatus } from "@/types/common"
+
+export type CustomerType = "B2B" | "B2C"
+
+export interface Customer {
+  customerId: number
+  customerCode: string
+  customerType: CustomerType
+  name: string
+  displayName: string | null
+  phone: string | null
+  email: string | null
+  addressLine1: string | null
+  addressLine2: string | null
+  city: string | null
+  country: string | null
+  taxRegistrationNo: string | null
+  creditLimit: number
+  creditDays: number
+  defaultWarehouseId: number | null
+  status: EntityStatus
+  createdAt: string
+  updatedAt: string | null
+}
diff --git a/Frontend/erp-system/types/general-ledger.ts b/Frontend/erp-system/types/general-ledger.ts
new file mode 100644
index 0000000..66817fa
--- /dev/null
+++ b/Frontend/erp-system/types/general-ledger.ts
@@ -0,0 +1,558 @@
+// Mirrors the external General Ledger service's own contract (04_API_Reference_And_Scenarios.md
+// in that service's repo — ERPCore does not re-document it, see docs/12-GENERAL-LEDGER-INTEGRATION.md).
+// Every field here is read through ERPCore's generic proxy (`lib/api/general-ledger.ts`), which
+// forwards byte-for-byte, so these types describe GL's response `data` shape directly, not an
+// ERPCore DTO. As of GL's 2026-07-22 revision (docs/21-GENERAL-LEDGER-FRONTEND.md §0/§3/§4).
+
+/** `account_type` seed rows — the block each drives in a generated account code (1000/2000/3000/4000/5000). */
+export enum GlAccountTypeId {
+  Asset = 1,
+  Liability = 2,
+  Equity = 3,
+  Income = 4,
+  Expense = 5,
+}
+
+export interface GlAccount {
+  accountId: number
+  accountCode: string
+  accountName: string
+  accountTypeId: GlAccountTypeId
+  parentAccountId: number | null
+  isControlAccount: boolean
+  isPostable: boolean
+  isActive: boolean
+  currencyCode: string
+  cashFlowCategory?: string | null
+}
+
+export interface GlAccountListResult {
+  items: GlAccount[]
+  totalCount: number
+  page: number | null
+  pageSize: number | null
+}
+
+export interface GlBudget {
+  budgetId: number
+  fiscalYearId: number
+  name: string
+  lines: unknown[]
+}
+
+export enum ReportOutputFormat {
+  Json = "Json",
+  Pdf = "Pdf",
+  Csv = "Csv",
+}
+
+export enum ReportType {
+  TrialBalance = "TrialBalance",
+  BalanceSheet = "BalanceSheet",
+  GeneralLedger = "GeneralLedger",
+  ProfitAndLoss = "ProfitAndLoss",
+  CashFlow = "CashFlow",
+  BudgetVsActual = "BudgetVsActual",
+  TaxSummary = "TaxSummary",
+}
+
+/** Flat as of the 2026-07-22 revision — GL dropped the hierarchy (`depth`/`indentedCode`) this report used to carry. */
+export interface TrialBalanceRow {
+  accountCode: string
+  accountName: string
+  debit: number
+  credit: number
+}
+
+/** One leaf account within a Balance Sheet section — no `depth`/hierarchy anymore (2026-07-31 rework, see BalanceSheetResponse). */
+export interface BalanceSheetLine {
+  accountCode: string
+  accountName: string
+  balance: number
+}
+
+export interface BalanceSheetSection {
+  lines: BalanceSheetLine[]
+  total: number
+}
+
+/**
+ * Confirmed shape (04_API_Reference_And_Scenarios.md, Module: Reporting, retrofit 2026-07-31) —
+ * replaces the old flat recursive-rollup array (`{depth, lineItem, accountType, balance}`) entirely
+ * with a classified LKAS 1 Statement of Financial Position: Non-Current/Current split for both
+ * Assets and Liabilities, driven by GL's new `accounts.balance_sheet_classification` tag.
+ * `equity.lines[]` always includes a synthetic `{ accountCode: "", accountName: "Current Year
+ * Earnings", balance }` line (even at `0.00`). Untagged leaf accounts land in
+ * `unclassifiedAssets`/`unclassifiedLiabilities` rather than being silently dropped.
+ *
+ * Every section is optional — same defensive posture as `CashFlowResponse`/`ProfitAndLossResponse`
+ * (confirmed live: GL omits an empty section from the JSON entirely rather than sending
+ * `{ lines: [], total: 0 }`), applied here pre-emptively since this exact shape hasn't been
+ * live-verified against this frontend yet.
+ */
+export interface BalanceSheetResponse {
+  asOfDate: string
+  nonCurrentAssets?: BalanceSheetSection
+  currentAssets?: BalanceSheetSection
+  unclassifiedAssets?: BalanceSheetSection
+  totalAssets: number
+  equity?: BalanceSheetSection
+  nonCurrentLiabilities?: BalanceSheetSection
+  currentLiabilities?: BalanceSheetSection
+  unclassifiedLiabilities?: BalanceSheetSection
+  totalEquityAndLiabilities: number
+}
+
+export interface GeneralLedgerRow {
+  entryDate: string
+  journalNo: string
+  accountCode: string
+  accountName: string
+  narration: string | null
+  debitAmount: number
+  creditAmount: number
+  runningBalance: number
+}
+
+/** One line inside a Profit & Loss section — inferred shape (see the ProfitAndLossResponse note). */
+export interface ProfitAndLossLine {
+  accountCode: string
+  accountName: string
+  amount: number
+}
+
+export interface ProfitAndLossSection {
+  lines: ProfitAndLossLine[]
+  total: number
+}
+
+/**
+ * Nested-sections shape (2026-07-22 rework, replaces the old flat `ProfitAndLossRow[]`). GL's own
+ * reference names the sections and the two top-level totals but does not spell out each line's
+ * exact field names — `ProfitAndLossLine` above is an **inferred** shape (matching every other
+ * report's `accountCode`/`accountName` convention), not a confirmed contract. `unclassified` is
+ * only present with lines if the Chart of Accounts has untagged Income/Expense accounts.
+ *
+ * Every section is optional — **confirmed live** (2026-07-31, via the identical bug on
+ * `CashFlowResponse`'s list fields below): GL's serializer omits a section from the JSON
+ * entirely when it has nothing to report for the period, rather than sending `{ lines: [], total: 0 }`.
+ * Every consumer must optional-chain (`report.sales?.lines`), never assume presence.
+ */
+export interface ProfitAndLossResponse {
+  sales?: ProfitAndLossSection
+  costOfSales?: ProfitAndLossSection
+  grossProfit: number
+  otherIncome?: ProfitAndLossSection
+  distributionExpenses?: ProfitAndLossSection
+  administrationExpenses?: ProfitAndLossSection
+  otherExpenses?: ProfitAndLossSection
+  financialExpenses?: ProfitAndLossSection
+  unclassified?: ProfitAndLossSection
+  netProfitForPeriod: number
+}
+
+export interface CashFlowNonCashAdjustment {
+  description: string
+  amount: number
+}
+
+/** `changeAmount`, not `amount` — confirmed field name (04_API_Reference_And_Scenarios.md, Module: Reporting). */
+export interface CashFlowWorkingCapitalChange {
+  accountCode: string
+  accountName: string
+  direction: "Increase" | "Decrease"
+  changeAmount: number
+}
+
+/** One line inside an Investing/Financing section — GL's reference confirms `lines[]` exists but not
+ * this line's own field names; `{description, amount}` here matches every other report's line-item
+ * convention but is not verified verbatim. */
+export interface CashFlowActivityLine {
+  description: string
+  amount: number
+}
+
+export interface CashFlowOperatingActivities {
+  profitForPeriod: number
+  nonCashAdjustments: CashFlowNonCashAdjustment[]
+  workingCapitalChanges: CashFlowWorkingCapitalChange[]
+  netCashFromOperatingActivities: number
+}
+
+export interface CashFlowInvestingActivities {
+  lines: CashFlowActivityLine[]
+  netCashFromInvestingActivities: number
+}
+
+export interface CashFlowFinancingActivities {
+  lines: CashFlowActivityLine[]
+  netCashFromFinancingActivities: number
+}
+
+/**
+ * Confirmed shape (04_API_Reference_And_Scenarios.md, Module: Reporting — GL's own API reference,
+ * not inferred). **Everything nests under `operatingActivities`** — the previous version of this
+ * type had `netEarnings`/`nonCashAdjustments`/`workingCapitalChanges`/`netCashFromOperations` as
+ * flat top-level fields, which was wrong and caused a live runtime crash (`Cannot read properties
+ * of undefined (reading 'map')` on `nonCashAdjustments` — it was never at the top level to begin
+ * with). `investingActivities`/`financingActivities` each have their own differently-named total
+ * field (`netCashFromInvestingActivities`/`netCashFromFinancingActivities`), not a shared `total`.
+ * `openingCashBalance`/`closingCashBalance` are returned for validation but deliberately not
+ * rendered on screen — GL's own PDF/CSV doesn't print them either.
+ */
+export interface CashFlowResponse {
+  periodStart: string
+  periodEnd: string
+  operatingActivities: CashFlowOperatingActivities
+  investingActivities: CashFlowInvestingActivities
+  financingActivities: CashFlowFinancingActivities
+  netIncreaseDecreaseInCash: number
+  openingCashBalance: number
+  closingCashBalance: number
+}
+
+export interface BudgetVsActualRow {
+  budgetLineId: number
+  accountCode: string
+  accountName: string
+  periodId: number
+  budgetedAmount: number
+  actualAmount: number
+  variance: number
+}
+
+/**
+ * Income Tax Computation (2026-07-22 redesign). Confirmed shape (04_API_Reference_And_Scenarios.md,
+ * Module: Reporting) — not inferred. The previous version of this type was missing
+ * `nonDeductibleExpenses`, `corporateIncomeTax`, `apitCredit`, `whtCredit`, and
+ * `quarterlyTaxPayments` entirely, which meant the Tax Report screen was silently dropping real
+ * GL-computed figures rather than a made-up guess just being wrong. Full row order,
+ * `profitBeforeTax` → `balanceTaxPayable`, with bold reconciliation checkpoints at
+ * `adjustedBusinessProfit`/`assessableIncome`/`taxableIncome`/`grossTaxLiability`/the final total.
+ */
+export interface TaxSummaryResponse {
+  periodStart: string
+  periodEnd: string
+  profitBeforeTax: number
+  nonDeductibleExpenses: number
+  allowableDeductions: number
+  adjustedBusinessProfit: number
+  otherTaxableIncome: number
+  assessableIncome: number
+  qualifyingPaymentsReliefs: number
+  taxableIncome: number
+  taxRatePercent: number
+  corporateIncomeTax: number
+  surchargeAmount: number
+  grossTaxLiability: number
+  apitCredit: number
+  whtCredit: number
+  quarterlyTaxPayments: number
+  balanceTaxPayable: number
+}
+
+export interface TaxSummaryParams {
+  periodStart: string
+  periodEnd: string
+  allowableDeductions?: number
+  otherTaxableIncome?: number
+  qualifyingPaymentsReliefs?: number
+  surchargeAmount?: number
+  taxRateOverride?: number
+}
+
+/** `outputFormat=Pdf`/`Csv` response shape — base64-encoded bytes inside the normal envelope either way. */
+export interface GlFilePayload {
+  fileName: string
+  contentType: string
+  contentBase64: string
+}
+
+/** Cash and Bank are two separate GL tables/endpoints (2026-07-22 rework) — this discriminates the unified list row and the create-form toggle, not a database column on either side. */
+export enum CashBankAccountType {
+  Cash = "Cash",
+  Bank = "Bank",
+}
+
+/**
+ * `GET /bank-accounts?accountType=Cash|Bank|Both` row shape (2026-07-22 rework) — GL's own reference
+ * documents this explicitly (`docs/21` §4), unlike the old single-table `BankAccount` shape it
+ * replaces, which was inferred. `bankName` is `null` on `Cash` rows, `cashAccountTypeName` is `null`
+ * on `Bank` rows.
+ */
+export interface CashAndBankAccountDto {
+  accountType: CashBankAccountType
+  accountId: number
+  accountName: string
+  bankName: string | null
+  cashAccountTypeName: string | null
+  accountNumber: string | null
+  glAccountId: number
+  currencyCode: string
+  createdAt: string
+}
+
+/**
+ * Confirmed (04_API_Reference_And_Scenarios.md, Module: Bank, retrofit 2026-07-31) —
+ * `glAccountCode` was removed from this request entirely. The backing GL account is now always
+ * auto-created server-side (a root "Bank" header account is found-or-created, then a postable leaf
+ * named after `accountName` is created under it) — the caller never selects or supplies a GL account.
+ */
+export interface CreateBankAccountRequest {
+  accountName: string
+  bankName?: string | null
+  accountNumber?: string | null
+  currencyCode?: string
+}
+
+/**
+ * Confirmed (retrofit 2026-07-31) — same `glAccountCode` removal as `CreateBankAccountRequest`, plus
+ * one more auto-created level: a root "Cash" header, then a per-`cashAccountTypeName` header (created
+ * once, reused thereafter), then a postable leaf named after `accountName`.
+ */
+export interface CreateCashAccountRequest {
+  accountName: string
+  cashAccountTypeName: string
+  accountNumber?: string | null
+  currencyCode?: string
+}
+
+/**
+ * `POST /bank-accounts` / `POST /cash-accounts` response (retrofit 2026-07-31) — since the GL account
+ * is now auto-created rather than caller-supplied, the created leaf account (nested under its
+ * auto-created/reused header via `parentAccount`) is returned under `glAccount` so the caller can see
+ * exactly what was generated. `glAccount`/`glAccountId` are confirmed from the reference doc; the
+ * other fields are inferred (they mirror the create request's own fields plus an id, following this
+ * project's usual `<entity>` response convention).
+ */
+export interface CreateCashOrBankAccountResponse {
+  accountName: string
+  bankName?: string | null
+  cashAccountTypeName?: string | null
+  accountNumber?: string | null
+  currencyCode: string
+  glAccountId: number
+  glAccount: GlAccount & { parentAccount?: GlAccount | null }
+}
+
+/** `GET /cash-account-types` row — flat reference list (seeded Petty Cash / Till Cash / Safe Cash / Cash in Transit, grows over time via on-the-fly creation from the create form). */
+export interface CashAccountType {
+  cashAccountTypeId: number
+  name: string
+}
+
+/** Shared `{ items, totalCount, page, pageSize }` list envelope used by every Cheque Management list endpoint. */
+export interface GlPagedResult<T> {
+  items: T[]
+  totalCount: number
+  page: number | null
+  pageSize: number | null
+}
+
+// ---------------------------------------------------------------------------
+// Cheque Management (new GL module, added 2026-07-30, beyond the original plan).
+// Purely operational tracking — no endpoint here ever creates/touches a journal entry itself.
+// `branchId`/`companyId`/`payeeId`/`voucherId`/`referenceId` are documented as deliberately
+// "loose references" (plain unvalidated numbers) — no Branch/Company/Customer/Supplier table
+// exists in this GL service for them to point at, so the frontend takes them as free-entry
+// numbers rather than picker dropdowns, matching GL's own stated design.
+// ---------------------------------------------------------------------------
+
+export enum PayeeType {
+  Supplier = "Supplier",
+  Customer = "Customer",
+  Employee = "Employee",
+  Other = "Other",
+}
+
+export enum ReceivedFromType {
+  Customer = "Customer",
+  Supplier = "Supplier",
+  Other = "Other",
+}
+
+export enum ChequeBookStatus {
+  Active = "Active",
+  Completed = "Completed",
+  Cancelled = "Cancelled",
+}
+
+export enum ChequePageIssueStatus {
+  Unused = "Unused",
+  Issued = "Issued",
+  Cleared = "Cleared",
+  Bounced = "Bounced",
+  Cancelled = "Cancelled",
+  Void = "Void",
+}
+
+/** `PUT /cheque-pages/{chequeNo}/status`'s `action` values. */
+export enum ChequePageStatusAction {
+  Clear = "Clear",
+  Bounce = "Bounce",
+  Cancel = "Cancel",
+  Void = "Void",
+}
+
+export enum ReceivedChequeStatus {
+  Received = "Received",
+  Deposited = "Deposited",
+  Cleared = "Cleared",
+  Returned = "Returned",
+  Cancelled = "Cancelled",
+}
+
+/** `PUT /received-cheques/{id}/status`'s `action` values. */
+export enum ReceivedChequeStatusAction {
+  Deposit = "Deposit",
+  Clear = "Clear",
+  Return = "Return",
+  Cancel = "Cancel",
+}
+
+/**
+ * A single leaf of a Cheque Book. GL's own reference confirms every field named in the `issue`
+ * request body plus `issueStatus`/`printedAt`/`clearedDate`/`clearedByBank`/`cancelReason` in
+ * prose — this type is built from those, not a guessed shape. `chequeNo` (not a numeric id) is
+ * the documented identifying value for `GET/PUT /cheque-pages/{chequeNo}`, so it's used as the
+ * key/URL param throughout rather than an unconfirmed `chequePageId`.
+ */
+export interface ChequePage {
+  chequeNo: string
+  chequeBookNo?: string
+  issueStatus: ChequePageIssueStatus
+  payeeType: PayeeType | null
+  payeeId: number | null
+  payeeName: string | null
+  issueDate: string | null
+  amount: number | null
+  currencyCode: string | null
+  voucherId: number | null
+  referenceNo: string | null
+  purpose: string | null
+  isCrossCheque: boolean | null
+  isAccountPayee: boolean | null
+  isPostDated: boolean | null
+  notes: string | null
+  printedBy: string | null
+  printedAt: string | null
+  clearedDate: string | null
+  clearedByBank: boolean | null
+  cancelReason: string | null
+}
+
+/**
+ * A cheque book issued from this company's own supply. `chequeBookNo` (caller-supplied, unique)
+ * is the documented identifying value for `GET /cheque-books/{chequeBookNo}`, used as the
+ * key/URL param throughout. `pages[]` is only populated when fetched with `?expand=pages`.
+ */
+export interface ChequeBook {
+  chequeBookNo: string
+  branchId: number
+  bankAccountId: number
+  startChequeNo: string
+  endChequeNo: string
+  totalLeaves: number
+  receivedDate: string
+  description: string | null
+  createdBy: string | null
+  status: ChequeBookStatus
+  pages: ChequePage[]
+}
+
+export interface CreateChequeBookRequest {
+  branchId: number
+  bankAccountId: number
+  chequeBookNo: string
+  startChequeNo: string
+  endChequeNo: string
+  totalLeaves: number
+  receivedDate: string
+  description?: string
+  createdBy?: string
+}
+
+export interface IssueChequePageRequest {
+  payeeType: PayeeType
+  payeeId?: number
+  payeeName: string
+  issueDate: string
+  amount: number
+  currencyCode?: string
+  voucherId?: number
+  referenceNo?: string
+  purpose?: string
+  isCrossCheque?: boolean
+  isAccountPayee?: boolean
+  isPostDated?: boolean
+  notes?: string
+  printedBy?: string
+}
+
+export interface UpdateChequePageStatusRequest {
+  action: ChequePageStatusAction
+  /** Required only for `action: "Clear"`. */
+  clearedDate?: string
+  /** Required only for `action: "Cancel"`. */
+  cancelReason?: string
+  performedBy?: string
+}
+
+/**
+ * A cheque received from a customer/supplier/other party — deliberately has no link to a
+ * `ChequeBook` (it isn't one of this company's own). GL's reference uses a numeric `{id}` in the
+ * URL for `GET/PUT /received-cheques/{id}` without spelling out the JSON field's exact name —
+ * `receivedChequeId` follows this project's consistent `<entity>Id` convention (e.g. `assetId`,
+ * `disposalId`), not a confirmed literal.
+ */
+export interface ReceivedCheque {
+  receivedChequeId: number
+  companyId: number
+  branchId: number | null
+  receivedFromType: ReceivedFromType
+  receivedFromId: number | null
+  receivedFromName: string
+  drawerBankName: string | null
+  drawerBankBranch: string | null
+  accountHolderName: string | null
+  chequeNo: string
+  chequeDate: string
+  amount: number
+  receivedDate: string
+  referenceType: string | null
+  referenceId: number | null
+  notes: string | null
+  createdBy: string | null
+  status: ReceivedChequeStatus
+  depositBankAccountId: number | null
+  depositDate: string | null
+}
+
+export interface CreateReceivedChequeRequest {
+  companyId: number
+  branchId?: number
+  receivedFromType: ReceivedFromType
+  receivedFromId?: number
+  receivedFromName: string
+  drawerBankName?: string
+  drawerBankBranch?: string
+  accountHolderName?: string
+  chequeNo: string
+  chequeDate: string
+  amount: number
+  receivedDate: string
+  referenceType?: string
+  referenceId?: number
+  notes?: string
+  createdBy?: string
+}
+
+export interface UpdateReceivedChequeStatusRequest {
+  action: ReceivedChequeStatusAction
+  /** Required only for `action: "Deposit"`. */
+  depositBankAccountId?: number
+  /** Required only for `action: "Deposit"`. */
+  depositDate?: string
+  notes?: string
+  performedBy?: string
+}
diff --git a/Frontend/erp-system/types/sales.ts b/Frontend/erp-system/types/sales.ts
new file mode 100644
index 0000000..b973e39
--- /dev/null
+++ b/Frontend/erp-system/types/sales.ts
@@ -0,0 +1,314 @@
+import { EntityStatus } from "@/types/common"
+
+export type SalesInvoiceType = "B2B" | "B2C" | "Cash" | "Credit"
+export type SalesInvoiceStatus = "Draft" | "Posted" | "Cancelled"
+export type SalesSlipStatus = "Draft" | "Posted" | "Cancelled"
+export type SalesDiscountMode = "Percentage" | "Amount"
+
+export interface SalesInvoiceLine {
+  salesInvoiceLineId: number
+  itemId: number
+  description: string
+  qty: number
+  freeQty: number
+  uomId: number
+  warehouseId: number
+  unitPrice: number
+  baseCost: number
+  priceSource: string
+  discountPct: number
+  discountAmount: number
+  discountMode: SalesDiscountMode
+  netUnitPrice: number
+  lineTotal: number
+  taxPct: number
+  taxAmount: number
+  isFreeIssue: boolean
+  parentLineId: number | null
+}
+
+export interface SalesInvoiceTotals {
+  subtotal: number
+  discountTotal: number
+  freeQtyTotal: number
+  taxTotal: number
+  grandTotal: number
+  roundOff: number
+  netPayable: number
+  paidAmount: number
+  balanceAmount: number
+}
+
+export interface SalesInvoiceSummary {
+  salesInvoiceId: number
+  invoiceNo: string
+  invoiceDate: string
+  customerId: number
+  customerSnapshotName: string
+  warehouseId: number
+  invoiceType: SalesInvoiceType
+  status: SalesInvoiceStatus
+  totals: SalesInvoiceTotals
+  createdAt: string
+}
+
+export interface SalesInvoicePostingIssue {
+  salesInvoiceLineId: number
+  itemId: number
+  itemSku: string
+  itemName: string
+  warehouseId: number
+  requestedQty: number
+  availableQty: number
+  shortQty: number
+  isFreeIssue: boolean
+}
+
+export interface SalesInvoicePostingCheck {
+  salesInvoiceId: number
+  invoiceNo: string
+  status: SalesInvoiceStatus
+  canPost: boolean
+  issues: SalesInvoicePostingIssue[]
+}
+
+export interface SalesSlipPostingIssue {
+  salesSlipLineId: number
+  itemId: number
+  itemSku: string
+  itemName: string
+  warehouseId: number
+  requestedQty: number
+  availableQty: number
+  shortQty: number
+  isFreeIssue: boolean
+}
+
+export interface SalesSlipPostingCheck {
+  salesSlipId: number
+  slipNo: string
+  status: SalesSlipStatus
+  canPost: boolean
+  issues: SalesSlipPostingIssue[]
+}
+
+export interface SalesInvoice extends SalesInvoiceSummary {
+  customerSnapshotTaxNo: string | null
+  createdBy: number
+  updatedAt: string | null
+  lines: SalesInvoiceLine[]
+}
+
+export interface CreateSalesInvoiceLineRequest {
+  itemId: number
+  uomId: number
+  warehouseId: number
+  qty: number
+  freeQty: number
+  unitPrice?: number | null
+  allowManualPriceOverride: boolean
+  discountMode: SalesDiscountMode
+  discountPct: number
+  discountAmount: number
+  discountValue: number
+  taxPct: number
+  isFreeIssue: boolean
+  parentLineId?: number | null
+}
+
+export interface CreateSalesInvoiceRequest {
+  customerId: number
+  warehouseId: number
+  invoiceType: SalesInvoiceType
+  lines: CreateSalesInvoiceLineRequest[]
+}
+
+export type UpdateSalesInvoiceRequest = CreateSalesInvoiceRequest
+
+export interface SalesSlipLine {
+  salesSlipLineId: number
+  itemId: number
+  description: string
+  qty: number
+  freeQty: number
+  uomId: number
+  warehouseId: number
+  unitPrice: number
+  baseCost: number
+  priceSource: string
+  discountPct: number
+  discountAmount: number
+  discountMode: SalesDiscountMode
+  netUnitPrice: number
+  lineTotal: number
+  taxPct: number
+  taxAmount: number
+  isFreeIssue: boolean
+  parentLineId: number | null
+}
+
+export interface SalesSlipTotals {
+  subtotal: number
+  discountTotal: number
+  freeQtyTotal: number
+  taxTotal: number
+  grandTotal: number
+  paidAmount: number
+  balanceAmount: number
+}
+
+export interface SalesSlipSummary {
+  salesSlipId: number
+  slipNo: string
+  slipDate: string
+  customerId: number
+  customerSnapshotName: string
+  warehouseId: number
+  status: SalesSlipStatus
+  totals: SalesSlipTotals
+  createdAt: string
+}
+
+export interface SalesSlip {
+  salesSlipId: number
+  slipNo: string
+  slipDate: string
+  customerId: number
+  customerSnapshotName: string
+  warehouseId: number
+  cashierUserId: number
+  status: SalesSlipStatus
+  createdAt: string
+  updatedAt: string | null
+  totals: SalesSlipTotals
+  lines: SalesSlipLine[]
+}
+
+export interface CreateSalesSlipLineRequest {
+  itemId: number
+  uomId: number
+  warehouseId: number
+  qty: number
+  freeQty: number
+  unitPrice?: number | null
+  allowManualPriceOverride: boolean
+  discountMode: SalesDiscountMode
+  discountPct: number
+  discountAmount: number
+  discountValue: number
+  taxPct: number
+  isFreeIssue: boolean
+  parentLineId?: number | null
+}
+
+export interface CreateSalesSlipRequest {
+  customerId: number
+  warehouseId: number
+  cashierUserId: number
+  lines: CreateSalesSlipLineRequest[]
+}
+
+export type UpdateSalesSlipRequest = CreateSalesSlipRequest
+
+export interface SalesReportDefinition {
+  id: string
+  name: string
+  description: string
+  supportedFilters: string[]
+}
+
+export interface SalesReportQueryRequest {
+  reportType: string
+  from: string
+  to: string
+  itemId?: number | null
+  customerId?: number | null
+  warehouseId?: number | null
+}
+
+export interface SalesReportQueryResponse {
+  reportType: string
+  from: string
+  to: string
+  rows: unknown[]
+}
+
+export interface SalesListFilterParams {
+  page?: number
+  pageSize?: number
+  status?: SalesInvoiceStatus | SalesSlipStatus
+  customerId?: number
+  warehouseId?: number
+}
+
+export interface FreeIssueSummaryItem extends SalesSlipSummary {
+  // Alias for the free issue route. Kept as a slip-shaped payload because the backend
+  // stores free issues as sales slips with free-issue line flags.
+  isFreeIssue?: boolean
+}
+
+export interface FreeIssueSummary {
+  salesSlipId: number
+  slipNo: string
+  status: SalesSlipStatus
+  createdAt: string
+  warehouseId: number
+  warehouseName: string
+  itemId: number
+  itemSku: string
+  itemName: string
+  uomId: number
+  uomName: string
+  qty: number
+  freeQty: number
+  schemeLabel: string
+}
+
+export interface FreeIssueDetail {
+  salesSlipId: number
+  slipNo: string
+  slipDate: string
+  status: SalesSlipStatus
+  customerId: number
+  customerSnapshotName: string
+  warehouseId: number
+  warehouseName: string
+  cashierUserId: number
+  createdAt: string
+  updatedAt: string | null
+  summary: FreeIssueSummary
+  lines: SalesSlipLine[]
+}
+
+export interface SalesFreeIssueRewardOption {
+  itemId: number
+  sku: string
+  name: string
+  salePrice: number | null
+}
+
+export interface SalesFreeIssueSuggestionLine {
+  salesSlipLineId: number
+  itemId: number
+  itemSku: string
+  itemName: string
+  qty: number
+  suggestedFreeQty: number
+  triggerQty: number
+  rewardOptions: SalesFreeIssueRewardOption[]
+}
+
+export interface SalesFreeIssueSuggestion {
+  salesSlipId: number
+  slipNo: string
+  slipDate: string
+  lines: SalesFreeIssueSuggestionLine[]
+}
+
+export interface SalesCustomer {
+  customerId: number
+  code: string
+  name: string
+  taxNo: string | null
+  status: EntityStatus
+}
diff --git a/docs/00-CORE.md b/docs/00-CORE.md
index 1d2d258..0218b00 100644
--- a/docs/00-CORE.md
+++ b/docs/00-CORE.md
@@ -21,6 +21,7 @@ A modular ERP built in phases. **Phase 1** delivers the **Inventory & Supply Cha
 Full requirements live in the backend spec (see §7). This file does **not** duplicate them.
 
 **Phase 2 (HRM)** is now underway alongside Phase 1 — see §7 routing to `12-BACKEND-HRM.md` / `13-BACKEND-HRM-API.md` / `21-FRONTEND-HRM.md`.
+Sales has its own API reference at `14-BACKEND-SALES-API.md`.
 
 ---
 
@@ -45,7 +46,10 @@ erp-monorepo/
     ├── 02-SECURITY.md            # accepted-risks register + per-feature security checklist
     ├── 10-BACKEND-PHASE1.md      # backend spec: SRS + ER/entities + tech + architecture
     ├── 11-BACKEND-PHASE1.md      # backend API reference (complete req/res)
-    └── 20-FRONTEND.md            # frontend user-flows + architecture rules + validation posture
+    ├── 14-BACKEND-SALES-API.md   # sales API reference (invoices, slips, free issues, reports)
+    ├── 12-GENERAL-LEDGER-INTEGRATION.md  # ERPCore ↔ external General Ledger service (transport only)
+    ├── 20-FRONTEND.md            # frontend user-flows + architecture rules + validation posture
+    └── 21-GENERAL-LEDGER-FRONTEND.md  # Ledgers section: reports UI + cash/bank accounts
 ```
 
 The `Backend/ERPCore/` internal layout is created in §5.3.
@@ -340,6 +344,9 @@ All frontend work is governed by `20-FRONTEND.md`.
 | API endpoints, request/response shapes, error catalog, enums (Phase 1) | **`11-BACKEND-PHASE1.md`** |
 | HRM requirements, business rules, entities, ER model (Phase 2) | **`12-BACKEND-HRM.md`** |
 | HRM API endpoints, request/response shapes, error catalog (Phase 2) | **`13-BACKEND-HRM-API.md`** |
+| Connecting to the external General Ledger service (proxy, config, API key) | **`12-GENERAL-LEDGER-INTEGRATION.md`** |
+| The Ledgers frontend section (reports, cash/bank accounts) | **`21-GENERAL-LEDGER-FRONTEND.md`** |
+| Sales API endpoints, request/response shapes, error catalog, enums | **`14-BACKEND-SALES-API.md`** |
 | Frontend user-flows, screen flow, architecture rules, validation posture (Phase 1) | **`20-FRONTEND.md`** |
 | HRM frontend user-flows (Phase 2) | **`21-FRONTEND-HRM.md`** |
 | Manufacturing requirements, business rules, entities, stock/costing integration, API (Phase 2) | **`30-BACKEND-PHASE2.md`** |
@@ -352,6 +359,7 @@ All frontend work is governed by `20-FRONTEND.md`.
 Quick resolver:
 - *"Where is the model / an entity defined?"* → `10-BACKEND-PHASE1.md` (Phase 1) / `12-BACKEND-HRM.md` (HRM) — schema is authoritative there.
 - *"What does this endpoint accept/return?"* → `11-BACKEND-PHASE1.md` (Phase 1) / `13-BACKEND-HRM-API.md` (HRM).
+- *"What does the sales API accept/return?"* → `14-BACKEND-SALES-API.md`.
 - *"How should the UI flow / what do I validate where?"* → `20-FRONTEND.md` (Phase 1) / `21-FRONTEND-HRM.md` (HRM).
 - *"What security risks / checks apply to this feature?"* → `02-SECURITY.md`.
 
diff --git a/docs/01-DOC-GUIDE.md b/docs/01-DOC-GUIDE.md
index f353525..3545ee6 100644
--- a/docs/01-DOC-GUIDE.md
+++ b/docs/01-DOC-GUIDE.md
@@ -38,10 +38,13 @@
 | `11-BACKEND-PHASE1.md` | High | Backend **API reference**: every endpoint with complete request/response, error catalog, enums. | Any API contract / controller / client work (Phase 1). | Claude + humans |
 | `12-BACKEND-HRM.md` | High | HRM backend spec: SRS, ER model, HRM-specific architecture notes. Schema is **authoritative** here. | Any HRM model / business-rule / requirement work (Phase 2). | Claude + humans |
 | `13-BACKEND-HRM-API.md` | High | HRM **API reference**: every endpoint, error catalog additions, enums. | Any HRM API contract / controller work. | Claude + humans |
+| `12-GENERAL-LEDGER-INTEGRATION.md` | High | ERPCore ↔ external **General Ledger service**: connection/proxy contract, config, progress. GL's own endpoint contract lives in the GL service's own repo, not here. | Any work touching the GL proxy or a future internal GL caller. | Claude + humans |
+| `14-BACKEND-SALES-API.md` | High | Sales **API reference**: invoices, slips, free issues, reports, enums. | Any sales API contract / controller work. | Claude + humans |
 | `20-FRONTEND.md` | High | Frontend **user-flows**, architecture rules to follow, **validation posture**. | Any frontend work (Phase 1). | Claude + humans |
 | `21-FRONTEND-HRM.md` | High | HRM frontend **user-flows**, screens, validation specifics. | Any HRM frontend work. | Claude + humans |
 | `30-BACKEND-PHASE2.md` | High | Manufacturing (Production Lines) backend: SRS, ER model, status machines, stock/costing integration, **and** the full API contract — model and API in one doc, unlike Phase 1. Schema is **authoritative** here. | Any manufacturing model / rule / API work. | Claude + humans |
 | `21-FRONTEND-PHASE2.md` | High | Manufacturing frontend **user-flows**: template canvas builder, run board, run execution screens. | Any manufacturing frontend work. | Claude + humans |
+| `21-GENERAL-LEDGER-FRONTEND.md` | High | **Ledgers** sidebar section: statutory-format report screens + PDF download, Cash/Bank Accounts (list/create; edit gap explained). Extends `20-FRONTEND.md` rather than duplicating it. | Any work on `app/dashboard/ledgers/*`. | Claude + humans |
 | `Backend/PROGRESS.md` | Low | Backend **change checklist**, git-shared. | After making backend changes. | **Claude** |
 | `Frontend/PROGRESS.md` | Low | Frontend **change checklist**, git-shared. | After making frontend changes. | **Claude** |
 
@@ -195,7 +198,7 @@ Spec: docs/20-FRONTEND.md (flows + rules) · docs/11-BACKEND-PHASE1.md (API cont
 ## 7. Adding future docs
 
 When later phases arrive (Sales & CRM, Manufacturing, QC/QA, Accounting), follow the same scheme HRM (Phase 2) established:
-- Backend spec/API for a phase → new `1x-` files continuing the backend decade (e.g. HRM used `12-BACKEND-HRM.md` + `13-BACKEND-HRM-API.md`, mirroring the `10`/`11` SRS+ER / API-reference split), linked from the hub.
+- Backend spec/API for a phase → new `1x-` files continuing the backend decade (e.g. HRM used `12-BACKEND-HRM.md` + `13-BACKEND-HRM-API.md`; sales now uses `14-BACKEND-SALES-API.md` alongside the existing phase docs), linked from the hub.
 - Frontend additions → extend `20-FRONTEND.md` or add `2x-` files (e.g. HRM used `21-FRONTEND-HRM.md`).
 - Always register the new doc in `00-CORE.md` routing (§7) and in this index (§2).
 
diff --git a/docs/12-GENERAL-LEDGER-INTEGRATION.md b/docs/12-GENERAL-LEDGER-INTEGRATION.md
new file mode 100644
index 0000000..a827537
--- /dev/null
+++ b/docs/12-GENERAL-LEDGER-INTEGRATION.md
@@ -0,0 +1,156 @@
+# 12 · GENERAL LEDGER INTEGRATION — ERPCore ↔ External GL Service
+
+> **Navigation:** you arrived from `00-CORE.md`. This doc is the **connection layer only** — the transport between ERPCore and the external General Ledger service. It is not the GL service's own API contract: every endpoint, request/response shape, and error code the GL service exposes is documented in that service's own repo (`04_API_Reference_And_Scenarios.md`, its `01_Full_Development_Plan.md`/`02_Phase_By_Phase_Development_Plan.md`/`03_Progress_Tracker.md` companions, and its Postman collection) — ERPCore does not duplicate that content here (`01-DOC-GUIDE.md` §5, single source of truth per topic).
+> **Record work:** `Backend/PROGRESS.md`.
+
+---
+
+## 1. What this is
+
+The General Ledger service is a **separate ASP.NET Core microservice** — its own repo, own database, no UI, no end-user login. It is called server-to-server, authenticated with a single shared secret (`X-Api-Key`), by "the core backend" — which, from this repo's side, is ERPCore.
+
+This pass connects the two systems at the **transport level only**:
+
+- A generic reverse-proxy endpoint on ERPCore (`/api/v1/gl/*`) that the frontend can call, which forwards the request to the GL service and returns its response unchanged.
+- A service-layer function (`IGeneralLedgerService.ForwardAsync`) that does the actual forwarding — usable today by the controller, and **intended to be called directly by other ERPCore services later** (GRN confirm, adjustments, etc. posting real journal entries into GL instead of — or alongside — the local `JournalEntryStub`). That internal wiring is **explicitly deferred**; nothing in ERPCore calls GL yet except the proxy itself.
+
+There is **no GL-specific business logic, no typed DTOs, and no per-endpoint validation** in ERPCore for this integration. Every request under `/api/v1/gl/*` is forwarded byte-for-byte — method, path, query string, request body, and `Content-Type` — and GL's response (status code, content type, body) comes back exactly as GL sent it, un-reshaped.
+
+---
+
+## 2. Architecture
+
+```
+Frontend ──► ERPCore  /api/v1/gl/{**path}   (ErpAccess door policy, same as every other v1 endpoint)
+              │
+              ▼
+       GeneralLedgerController  (Controllers/GeneralLedgerController.cs)
+              │  Request.Method, path, QueryString, ContentType, Body — untouched
+              ▼
+       IGeneralLedgerService.ForwardAsync   (Services/GeneralLedgerService.cs)
+              │  the one function — controller and future internal callers both use this
+              ▼
+       IGeneralLedgerClient.SendAsync   (Infra/Gl/GeneralLedgerClient.cs)
+              │  attaches X-Api-Key, streams body through, no parsing
+              ▼
+       External GL service   (GeneralLedgerService:BaseUrl)
+```
+
+**Why a generic proxy and not typed endpoints:** the GL service's own reference (`04_API_Reference_And_Scenarios.md`) documents ~15 modules and 40+ endpoint variations (Accounts, Fiscal Calendar, Currency, Cost Centers, Journal Entries, Recurring Entries, Tax, Fixed Assets, Bank, Budget, Reporting, System Config, Audit Log). Modelling all of that as ERPCore DTOs before any of it is actually consumed would be premature — this pass connects the pipe; the next pass (deferred, see §6) picks specific GL calls to wire into specific ERPCore workflows and can build typed request/response DTOs for exactly those calls at that point.
+
+**Layering matches the existing AuthHex integration** (`Infra/Auth/AuthHex/IAuthHexClient` → `Services/Auth/*` → `AuthController`), except AuthHex's client unwraps a known envelope into typed results, while GL's client deliberately does not — see §4.
+
+---
+
+## 3. Configuration
+
+`Backend/ERPCore/appsettings.json`:
+
+```json
+"GeneralLedgerService": {
+  "BaseUrl": "https://localhost:7024/api/v1/",
+  "ApiKey": ""
+}
+```
+
+| Key | Purpose |
+|---|---|
+| `GeneralLedgerService:BaseUrl` | The GL service's base URL, **including** `/api/v1/` and a trailing slash (so relative paths combine correctly against `HttpClient.BaseAddress`). GL's own docs note it calls `UseHttpsRedirection()` before its API-key check runs — use the `https://` URL directly, per GL's own integration guide §3, to avoid every call taking a `307` round-trip. |
+| `GeneralLedgerService:ApiKey` | The shared secret sent as `X-Api-Key` on every forwarded call. **Ships blank** — same pattern as this project's own `ApiKey`-style secrets (02-SECURITY AR-06): get a value from the GL service's own `POST /api/v1/dev-tools/generate-api-key` (Development only) and paste it in here *and* into the GL service's own `ApiKey:Value` config — it is one shared string on both sides, not a per-caller credential. |
+
+Not touched by this pass: `appsettings.Development.json` / `appsettings.Production.json` — fill in a real key locally the same way `AuthHex:BaseUrl` and other per-environment values are handled today (edit the file directly for local dev; environment-variable override for prod, per `00-CORE.md §5.4`'s secrets note).
+
+---
+
+## 4. The proxy contract
+
+### `{GET|POST|PUT} /api/v1/gl/{**path}`
+
+- **Auth:** requires a valid ERPCore session (AuthHex-issued token, `erp_at` cookie or Bearer header) satisfying the `ErpAccess` door policy — identical to every other `/api/v1/*` endpoint (`ApiControllerBase`). The GL `X-Api-Key` itself is attached **server-side only**; the frontend never sees it and cannot set it.
+- **Method:** only `GET`/`POST`/`PUT` are exposed — the GL service's own API reference has no `PATCH` or `DELETE` endpoint anywhere in its surface, so those verbs aren't wired.
+- **`{**path}`:** everything after `/api/v1/gl/` is forwarded as-is to the GL service's own `/api/v1/{path}` — e.g. a frontend call to `POST /api/v1/gl/journal-entries` reaches GL's `POST /api/v1/journal-entries`. Query string is forwarded unchanged.
+- **Body:** for `POST`/`PUT`, the raw request body (and its `Content-Type` header) is streamed straight through — this is what makes the one `multipart/form-data` endpoint (bank statement import) work through the proxy without ERPCore needing to understand multipart at all.
+- **Response:** GL's status code, `Content-Type`, and body are returned to the frontend **unchanged**. This deliberately preserves two documented GL quirks rather than papering over them:
+  - GL's success bodies are camelCase (`{"statusCode":200,...}`), its error bodies (from its own exception/API-key middleware) are PascalCase (`{"StatusCode":400,...}`) — GL's own docs flag this as a known inconsistency, not fixed on their side yet. ERPCore does not normalize it; the frontend must handle both shapes (case-insensitive deserialization), same as GL's own integration guide recommends to *its* callers.
+  - `outputFormat=Json` report amounts keep full decimal precision (no rounding) — since ERPCore never deserializes the body into its own model, nothing here can accidentally truncate it.
+- **This proxy needs zero code changes whenever GL's own domain contract evolves — confirmed again as of GL's 2026-07-22 revision (§7).** Five reports were restructured, `outputFormat` gained a `Csv` value, Cash/Bank accounts split into two endpoints, and numerous fields were renamed from numeric IDs to business codes (`CLAUDE.md` Rule 8.2 on GL's side) — none of it touched this file. That's the entire point of a byte-for-byte proxy over typed per-endpoint DTOs (§2's rationale): a generic passthrough only ever needs a code change when the *transport* contract changes (new HTTP verb, new content type, new auth mechanism), never when GL's own request/response payloads gain, lose, or rename fields. §7 is a curated reference of what's actually being called today, kept for the frontend team's convenience — it is documentation, not something this proxy depends on or needs updated in lockstep with.
+
+### Failure modes added by ERPCore itself
+
+| Case | Status | `code` |
+|---|---|---|
+| GL service unreachable (connection refused/DNS/etc.) | 503 | `GL_SERVICE_UNAVAILABLE` |
+| GL service timed out | 503 | `GL_SERVICE_UNAVAILABLE` |
+| No/invalid ERPCore session | 401/403 | (standard ERPCore door-policy response — request never reaches the proxy) |
+
+Everything else — `401` for a bad `X-Api-Key` (can't happen here since ERPCore always attaches the configured key, but a misconfigured/blank key on either side would surface as this), every domain `400`/`404`/`409`/`422` GL itself returns — passes straight through with GL's own body and message, untouched.
+
+---
+
+## 5. What is *not* done in this pass
+
+- **No internal service calls into GL.** `IGeneralLedgerService.ForwardAsync` exists and is registered in DI, but no ERPCore service (GRN, Adjustment, Transfer, PO, etc.) calls it yet. The local `JournalEntryStub` (docs/10 §C.7, FR-STK-13) is untouched and remains the only GL-adjacent artifact those flows produce today.
+- **No typed request/response DTOs** for any GL endpoint — the proxy is byte-for-byte, so nothing in ERPCore currently understands GL's schema.
+- **No path allowlist.** The proxy forwards *any* path under `/api/v1/gl/` to GL — it trusts GL's own routing/auth to reject anything invalid. Acceptable for now because the proxy is still gated by ERPCore's own door policy (only ERP-admitted users reach it at all) and GL requires its own valid `X-Api-Key` regardless, but worth revisiting alongside per-endpoint RBAC (02-SECURITY Part D) if GL exposes anything sufficiently destructive to warrant narrowing.
+- **No `appsettings.Development.json`/`appsettings.Production.json` changes** — only the base `appsettings.json` shape was added, per this pass's scope (connect the pipe, not configure every environment).
+- **No CORS/rate-limiting review specific to this proxy** — it inherits whatever ERPCore already has (currently none, same accepted gap as `AuthController`, 02-SECURITY AR-08).
+
+---
+
+## 6. Progress
+
+- [x] **Transport wired (2026-07-20).** `Infra/Gl/{IGeneralLedgerClient,GeneralLedgerClient,GeneralLedgerResponse}` — typed `HttpClient` (`GeneralLedgerService:BaseUrl`), attaches `X-Api-Key` (`GeneralLedgerService:ApiKey`), streams request/response bodies through unparsed. `Services/{Interfaces/IGeneralLedgerService,GeneralLedgerService}` — the shared forwarding function. `Controllers/GeneralLedgerController` — `GET|POST|PUT /api/v1/gl/{**path}`, `ErpAccess`-gated like every other v1 controller. Config keys added to `appsettings.json`. Build verified clean (`dotnet build`, 0 warnings/0 errors).
+- [ ] **Live smoke test against a running GL instance** — not yet run in this pass (no GL instance available in this session). Before relying on this in anger: generate a dev API key from GL's `POST /api/v1/dev-tools/generate-api-key`, put it in both sides' config, and round-trip at least one call per HTTP verb (e.g. `GET /api/v1/gl/accounts`, `POST /api/v1/gl/accounts`, `PUT /api/v1/gl/accounts/{code}`) plus the multipart import call, to confirm the byte-for-byte passthrough holds in practice (headers, streaming, status codes).
+- [ ] **Internal wiring** — pick the first real ERPCore→GL use case (most likely candidate: posting `FifoCostingService`/`StockMutator`-driven movements as real GL journal entries instead of `JournalEntryStub` rows) and build the typed request/response DTOs + service calls for that specific flow through `IGeneralLedgerService`. Deliberately deferred per this pass's scope.
+- [ ] **Security pass once real traffic flows** — revisit the "no path allowlist" note in §5, decide whether `GeneralLedgerService:ApiKey` needs to move to a secret store before any shared/staging use (same trigger as `02-SECURITY.md` AR-06), and whether this proxy needs its own accepted-risk entry there.
+
+---
+
+## 7. Endpoint reference — GL endpoints currently used (or planned) by the frontend
+
+**Purpose of this section:** a quick-reference summary of exactly which GL endpoints the frontend calls, for connecting new screens without re-reading GL's full `04_API_Reference_And_Scenarios.md` from scratch each time. **This is a curated summary, not the canonical contract** — for exact request/response shapes, every field, and every error case, GL's own reference stays authoritative (`01-DOC-GUIDE.md §5`). Every call below goes through this proxy at `/api/v1/gl/{path}` (drop the leading `/api/v1` from GL's own documented paths, prefix `/api/v1/gl` instead — e.g. GL's `GET /api/v1/reports` is called here as `GET /api/v1/gl/reports`).
+
+As of GL's 2026-07-22 revision. Full detail for anything marked "see GL §X" is in GL's `04_API_Reference_And_Scenarios.md` at that section.
+
+### Reporting (`docs/21` §3 — all seven Ledgers report screens)
+
+| Method | Path | Used for | Key params |
+|---|---|---|---|
+| `GET` | `/reports` | All seven report screens, one shared endpoint | `reportType` (`GeneralLedger`\|`TrialBalance`\|`BalanceSheet`\|`ProfitAndLoss`\|`CashFlow`\|`BudgetVsActual`\|`TaxSummary`), `outputFormat` (`Json`\|`Pdf`\|`Csv`), plus report-specific params — see GL §"GET /reports" for the full per-`reportType` table |
+
+One endpoint, one row — every report screen and both download buttons (`DownloadPdfButton`/`DownloadCsvButton`) call this same path with different query parameters. Nothing else in this module hits a second reporting endpoint.
+
+### Accounts (`docs/21` §3/§4 — GL-account pickers only, never a screen of its own here)
+
+| Method | Path | Used for | Key params |
+|---|---|---|---|
+| `GET` | `/accounts` | Populates the `glAccountCode` picker on the Bank/Cash create forms | none required — full list |
+
+This module never creates, edits, or has a dedicated screen for GL's own Chart of Accounts — `GET /accounts` is called purely to feed a `code — name` dropdown elsewhere.
+
+### Bank & Cash Accounts (`docs/21` §4)
+
+| Method | Path | Used for | Key params |
+|---|---|---|---|
+| `GET` | `/bank-accounts` | Unified Cash+Bank list page | `accountType` (optional — `Cash`\|`Bank`\|`Both`, default `Both`) |
+| `POST` | `/bank-accounts` | Create form, "Bank" selected | `accountName`, `bankName`/`accountNumber` (optional), `glAccountCode`, `currencyCode` (optional) |
+| `POST` | `/cash-accounts` | Create form, "Cash" selected | `accountName`, `cashAccountTypeName`, `accountNumber` (optional, auto-generated if omitted), `glAccountCode`, `currencyCode` (optional) |
+| `GET` | `/cash-account-types` | Populates the Cash Account Type picker on the create form | none — full list |
+| `POST` | `/bank-accounts/{id}/statement-lines/import` | Not yet built on the frontend — bank statement `.xlsx` import, `multipart/form-data` | field name `file` |
+| `PUT` | `/bank-statement-lines/{id}/reconcile` | Not yet built on the frontend — reconcile a statement line | `matchedJournalNo` |
+
+No `GET`/`PUT` by id exists on GL's side for either `bank_account` or `cash_account` — this is the entire reason edit can't be built yet (`docs/21` §4's known gap).
+
+### Budgets (`docs/21` §3 — picker only)
+
+| Method | Path | Used for | Key params |
+|---|---|---|---|
+| `GET` | `/budgets` | Populates the `budgetId` picker on the Budget vs Actual report screen | none — full list |
+
+### Not currently called by this frontend, listed for awareness
+
+GL exposes a substantially larger surface than this module touches — Journal Entries, Fiscal Calendar, Cost Centers, Currency, Tax Codes, Fixed Assets, Recurring Templates, System Config, Audit Log. None of these have a screen in `docs/21` today. If a future pass adds one, add its row to the relevant table above rather than leaving this reference to drift out of sync with what's actually called — that's the whole value of keeping this section current.
+
+---
+
+*End of 12-GENERAL-LEDGER-INTEGRATION.md. Hub: `00-CORE.md`. Record work: `Backend/PROGRESS.md`.*
diff --git a/docs/14-BACKEND-SALES-API.md b/docs/14-BACKEND-SALES-API.md
new file mode 100644
index 0000000..a6a1b3b
--- /dev/null
+++ b/docs/14-BACKEND-SALES-API.md
@@ -0,0 +1,278 @@
+# 14 · BACKEND — Sales API Reference
+
+> **Authoritative for:** sales API contracts for invoices, slips, bundle sales, free issues, and sales reports.
+> **Navigation:** start from `00-CORE.md`. Sales business rules live in `docs/SALES_MODULE_PLAN.md` and the sales-related backend progress is tracked in `Backend/PROGRESS.md`.
+> **Scope:** this document covers the sales endpoints currently implemented in ERPCore. Free issue is modeled as a sales-slip alias, not a separate table.
+
+---
+
+## 1. Conventions
+
+- Base URL: `https://{host}/api/v1`
+- Authentication: same as the rest of the v1 API
+- Concurrency: `ETag` / `If-Match` on mutable resources
+- Validation: `ProblemDetails` / `ValidationProblemDetails`
+
+---
+
+## 2. Sales Invoices
+
+### `GET /api/v1/sales-invoices`
+Query:
+- `page`
+- `pageSize`
+- `q`
+- `status`
+- `customerId`
+- `warehouseId`
+
+Returns a paged list of `SalesInvoiceSummaryDto`.
+The current frontend register uses this endpoint directly for the invoice hub view.
+
+### `GET /api/v1/sales-invoices/{salesInvoiceId}`
+Returns `SalesInvoiceDto`.
+The detail page shows the document template and only exposes edit actions when the invoice is `Draft`.
+
+### `POST /api/v1/sales-invoices`
+Creates a draft sales invoice.
+
+Request:
+```json
+{
+  "customerId": 2,
+  "warehouseId": 1,
+  "invoiceType": "B2C",
+  "lines": [
+    {
+      "itemId": 1,
+      "uomId": 1,
+      "warehouseId": 1,
+      "qty": 1,
+      "freeQty": 0,
+      "unitPrice": 100,
+      "allowManualPriceOverride": false,
+      "discountMode": "Percentage",
+      "discountPct": 0,
+      "discountAmount": 0,
+      "discountValue": 0,
+      "taxPct": 0,
+      "isFreeIssue": false,
+      "parentLineId": null
+    }
+  ]
+}
+```
+
+### `PUT /api/v1/sales-invoices/{salesInvoiceId}`
+Updates a draft invoice. Requires `If-Match`.
+
+### `POST /api/v1/sales-invoices/{salesInvoiceId}/post`
+Posts stock out and marks the invoice as `Posted`.
+Before posting, the UI calls `GET /api/v1/sales-invoices/{salesInvoiceId}/posting-check` to show shortages.
+
+### `POST /api/v1/sales-invoices/{salesInvoiceId}/cancel`
+Cancels a draft invoice.
+
+---
+
+## 3. Sales Slips
+
+### `GET /api/v1/sales-slips`
+Query:
+- `page`
+- `pageSize`
+- `q`
+- `status`
+- `customerId`
+- `warehouseId`
+
+Returns a paged list of `SalesSlipSummaryDto`.
+
+### `GET /api/v1/sales-slips/{salesSlipId}`
+Returns `SalesSlipDto`.
+The detail page follows the same document-style layout and draft-only edit behavior as invoices.
+
+### `POST /api/v1/sales-slips`
+Creates a draft sales slip.
+
+Request:
+```json
+{
+  "customerId": 2,
+  "warehouseId": 1,
+  "cashierUserId": 1,
+  "lines": [
+    {
+      "itemId": 1,
+      "uomId": 1,
+      "warehouseId": 1,
+      "qty": 1,
+      "freeQty": 0,
+      "unitPrice": 50,
+      "allowManualPriceOverride": false,
+      "discountMode": "Percentage",
+      "discountPct": 0,
+      "discountAmount": 0,
+      "discountValue": 0,
+      "taxPct": 0,
+      "isFreeIssue": false,
+      "parentLineId": null
+    }
+  ]
+}
+```
+
+### `PUT /api/v1/sales-slips/{salesSlipId}`
+Updates a draft slip. Requires `If-Match`.
+
+### `POST /api/v1/sales-slips/{salesSlipId}/post`
+Posts stock out and marks the slip as `Posted`.
+Before posting, the UI calls `GET /api/v1/sales-slips/{salesSlipId}/posting-check`.
+
+### `POST /api/v1/sales-slips/{salesSlipId}/cancel`
+Cancels a draft slip.
+
+--- 
+
+## 4. Bundle Sales
+
+Bundle sales are a separate sales document family for fixed bundle compositions.
+
+### `GET /api/v1/bundle-sales`
+Query:
+- `page`
+- `pageSize`
+- `q`
+- `customerId`
+- `warehouseId`
+
+Returns a paged list of `BundleSaleSummaryDto`.
+
+### `GET /api/v1/bundle-sales/{bundleSaleId}`
+Returns `BundleSaleDto`.
+
+### `GET /api/v1/bundle-sales/{bundleSaleId}/posting-check`
+Validates component stock before posting.
+
+### `POST /api/v1/bundle-sales`
+Creates a draft bundle sale from a fixed template.
+
+Request:
+```json
+{
+  "customerId": 2,
+  "warehouseId": 1,
+  "cashierUserId": 1,
+  "bundleSaleTemplateId": 1,
+  "bundleName": "Summer Promo Pack",
+  "bundleCode": "BND-001",
+  "bundlePrice": 2500,
+  "allowPriceOverride": true
+}
+```
+
+### `PUT /api/v1/bundle-sales/{bundleSaleId}`
+Updates a draft bundle sale. Requires `If-Match`.
+
+### `POST /api/v1/bundle-sales/{bundleSaleId}/post`
+Posts the bundle and consumes stock from the included component lines.
+
+### `POST /api/v1/bundle-sales/{bundleSaleId}/cancel`
+Cancels a draft bundle sale.
+
+Business rule:
+- bundle composition is fixed by template lines
+- posting consumes component stock, not a synthetic bundle stock item
+- print pages should show both the bundle summary and the component breakdown
+
+---
+
+## 5. Free Issues
+
+Free issue is a business alias over sales slips.
+There is no separate free-issue table in the current schema.
+
+### `GET /api/v1/free-issues`
+Same contract as `GET /api/v1/sales-slips`.
+
+### `GET /api/v1/free-issues/{freeIssueId}`
+Same contract as `GET /api/v1/sales-slips/{salesSlipId}`.
+
+### `POST /api/v1/free-issues`
+Same contract as `POST /api/v1/sales-slips`.
+
+### `PUT /api/v1/free-issues/{freeIssueId}`
+Same contract as `PUT /api/v1/sales-slips/{salesSlipId}`.
+
+### `POST /api/v1/free-issues/{freeIssueId}/post`
+Same contract as `POST /api/v1/sales-slips/{salesSlipId}/post`.
+
+### `POST /api/v1/free-issues/{freeIssueId}/cancel`
+Same contract as `POST /api/v1/sales-slips/{salesSlipId}/cancel`.
+
+Business rule:
+- free issue is represented by `IsFreeIssue=true` and/or `FreeQty>0`
+- it still posts stock out through the normal slip posting flow
+- the frontend free-issue screen is the main working page for create/list/edit/cancel
+- cancelled free-issue records are hidden from the working list view
+
+---
+
+## 6. Sales Reports
+
+### `GET /api/v1/reports/sales`
+Returns the report catalog.
+
+Response:
+```json
+[
+  {
+    "id": "daily-summary",
+    "name": "Daily Summary",
+    "description": "Aggregated sales by day across posted invoices and slips.",
+    "supportedFilters": ["from", "to"]
+  }
+]
+```
+
+### `GET /api/v1/reports/sales/{reportId}`
+Returns a single report definition by id.
+
+### `POST /api/v1/reports/sales/query`
+Returns the actual report data.
+
+Request:
+```json
+{
+  "reportType": "item-summary",
+  "from": "2026-07-01",
+  "to": "2026-07-28",
+  "itemId": 1,
+  "customerId": null,
+  "warehouseId": 1
+}
+```
+
+Supported report types:
+- `daily-summary`
+- `item-summary`
+- `customer-summary`
+- `warehouse-summary`
+- `discount-summary`
+- `free-issue-summary`
+
+Validation rule:
+- invalid filters for a given report type are rejected
+- unsupported report types are rejected
+- the frontend report page uses the same endpoint for all report types
+- `daily-summary` auto-loads with a default date range in the UI
+- the report results table is rendered from the backend response rows, not hardcoded data
+
+---
+
+## 7. Notes
+
+- The sales report service reads both invoices and slips where relevant.
+- Free issue reporting is derived from the same sales document lines.
+- Bundle sales are treated as a separate fixed-composition document family.
+- There is no separate free-issue table in the current schema.
diff --git a/docs/15-BACKEND-SALES-BUNDLES.md b/docs/15-BACKEND-SALES-BUNDLES.md
new file mode 100644
index 0000000..40da017
--- /dev/null
+++ b/docs/15-BACKEND-SALES-BUNDLES.md
@@ -0,0 +1,136 @@
+# 15 · BACKEND — Bundle Sales API
+
+> **Authoritative for:** fixed-composition bundle sales, templates, posting, and print data.
+> **Navigation:** start from `00-CORE.md`. This module follows the same repository/UoW/ETag/audit patterns as invoices and slips.
+
+---
+
+## 1. Concept
+
+Bundle sales are a separate sales document family for fixed bundle compositions.
+
+Rules:
+- a bundle sale is created from a bundle template
+- the bundle template defines fixed component stock lines
+- posting consumes stock from the component items, not from a synthetic bundle SKU
+- the bundle header carries the commercial sale value
+- print views show both bundle summary and component breakdown
+
+---
+
+## 2. API
+
+### `GET /api/v1/bundle-sales`
+Query:
+- `page`
+- `pageSize`
+- `q`
+- `customerId`
+- `warehouseId`
+
+### `GET /api/v1/bundle-sales/{bundleSaleId}`
+Returns the bundle sale header and all component lines.
+
+### `GET /api/v1/bundle-sales/{bundleSaleId}/posting-check`
+Validates component stock before posting.
+
+### `POST /api/v1/bundle-sales`
+Creates a draft bundle sale from a fixed bundle template.
+
+### `PUT /api/v1/bundle-sales/{bundleSaleId}`
+Updates a draft bundle sale. Requires `If-Match`.
+
+### `POST /api/v1/bundle-sales/{bundleSaleId}/post`
+Consumes stock from included component lines and marks the bundle as posted.
+
+### `POST /api/v1/bundle-sales/{bundleSaleId}/cancel`
+Cancels a draft bundle sale.
+
+---
+
+## 3. Template Rules
+
+- bundle templates are fixed in composition
+- each template line maps to one component stock item
+- component quantities are expanded into the sale draft at creation time
+- price override is allowed only when the caller is permitted by business rules
+
+---
+
+## 4. Data Model
+
+### `BundleSaleTemplate`
+- `BundleSaleTemplateId`
+- `TemplateCode`
+- `TemplateName`
+- `Description`
+- `Status`
+- `CreatedAt`
+- `UpdatedAt`
+- `RowVersion`
+
+### `BundleSaleTemplateLine`
+- `BundleSaleTemplateLineId`
+- `BundleSaleTemplateId`
+- `ItemId`
+- `UomId`
+- `WarehouseId`
+- `Qty`
+- `UnitPrice`
+- `IncludeInBundle`
+- `SortOrder`
+
+### `BundleSale`
+- `BundleSaleId`
+- `BundleNo`
+- `BundleDate`
+- `CustomerId`
+- `CustomerSnapshotName`
+- `WarehouseId`
+- `CashierUserId`
+- `BundleSaleTemplateId`
+- `BundleName`
+- `BundleCode`
+- `Status`
+- `ComponentSubtotal`
+- `BundlePrice`
+- `MarginAmount`
+- `DiscountTotal`
+- `TaxTotal`
+- `GrandTotal`
+- `CreatedAt`
+- `UpdatedAt`
+- `RowVersion`
+
+### `BundleSaleLine`
+- `BundleSaleLineId`
+- `BundleSaleId`
+- `ItemId`
+- `Description`
+- `Qty`
+- `UomId`
+- `WarehouseId`
+- `UnitPrice`
+- `LineTotal`
+- `IncludeInBundle`
+- `IsComponent`
+- `ParentLineId`
+- `RowVersion`
+
+---
+
+## 5. Posting
+
+Posting behavior:
+- validate each included component line has sufficient stock
+- consume FIFO layers from the component items
+- write stock ledger rows for each component
+- mark the bundle as posted in the same transaction
+
+---
+
+## 6. Notes
+
+- This module is intentionally separate from invoices and slips.
+- Bundle sales are for fixed compositions only in this phase.
+- Print views should mirror the existing sales document print behavior without the dashboard shell.
diff --git a/docs/21-GENERAL-LEDGER-FRONTEND.md b/docs/21-GENERAL-LEDGER-FRONTEND.md
new file mode 100644
index 0000000..c89cdbb
--- /dev/null
+++ b/docs/21-GENERAL-LEDGER-FRONTEND.md
@@ -0,0 +1,532 @@
+# 21 · GENERAL LEDGER — Frontend (Ledgers section)
+
+> **Navigation:** you arrived from `00-CORE.md`. The transport this section calls through is
+> `docs/12-GENERAL-LEDGER-INTEGRATION.md` (ERPCore's `/api/v1/gl/*` proxy into the external General
+> Ledger service — that doc's new §7 has a curated endpoint reference for everything this page uses).
+> General frontend architecture/validation rules are `20-FRONTEND.md` — this doc only adds what's
+> specific to the Ledgers screens. Record work in `Frontend/PROGRESS.md`.
+> **GL's own endpoint contract** (exact request/response shapes, error cases) lives in the General
+> Ledger service's own repo (`04_API_Reference_And_Scenarios.md`) — not duplicated here in full, per
+> `01-DOC-GUIDE.md §5`'s single-source-of-truth rule; `docs/12` §7 is a summary for quick reference,
+> that doc is the canonical detail.
+
+---
+
+## 0. Major update, 2026-07-22 — the GL backend changed substantially since this section was last built
+
+**Nothing in this pass has been implemented against the frontend codebase yet.** The 2026-07-20 build (§6's history) reflects an earlier, now-superseded GL contract. This revision describes the *target* design against the confirmed, live-verified-on-GL's-side contract as of 2026-07-22 — every section below should be read as "what to build," not "what exists," until §6 says otherwise.
+
+Three things changed on GL's side, in order of how much they affect this doc:
+
+1. **Five reports got real structural rework** (not just field renames) — Trial Balance flattened, Profit & Loss restructured into named sections, Cash Flow's display simplified, Tax Report **completely redesigned** into an Income Tax Computation (previously a VAT/WHT/NBT summary), plus a new `outputFormat=Csv` on all seven reports.
+2. **Cash and Bank accounts are two separate GL tables/endpoints now**, not one table with a type field — `POST /bank-accounts` (unchanged) and a new `POST /cash-accounts`, unified for reading via `GET /bank-accounts?accountType=Cash|Bank|Both`.
+3. **`CLAUDE.md` Rule 8.2 renamed numeric ID fields to business codes across most of GL's API** — the one that reaches this page: `GeneralLedger`'s `accountId` param is now `accountCode` (still optional, same two-mode behavior as before), and the Bank/Cash create forms' `glAccountId` is now `glAccountCode`.
+
+---
+
+## 1. What this is
+
+A new **Ledgers** sidebar section (`app/dashboard/ledgers/*`) giving the frontend statutory-format
+financial reports and cash/bank-account management, sourced entirely from the external General Ledger
+service via ERPCore's generic proxy (`docs/12-GENERAL-LEDGER-INTEGRATION.md`). Every screen calls
+`GET /api/v1/gl/reports` or `/gl/bank-accounts`/`/gl/cash-accounts` — there is no ERPCore business
+logic behind any of it yet (that internal wiring, e.g. posting real journal entries from
+GRN/adjustments, is tracked separately and deliberately deferred, see `docs/12` §6).
+
+**Sidebar structure** (`components/Layouts/AppSidebar.tsx`, mirrored server-side in
+`Backend/ERPCore/Infra/Persistence/Configurations/{NavItem,SubNavItem,Permission}Configuration.cs`
+per the existing RBAC-nav convention, docs/10 C.8/C.9) — **gains one entry, Tax Report:**
+
+```
+Ledgers
+├── Trial Balance          /dashboard/ledgers/trial-balance
+├── Balance Sheet          /dashboard/ledgers/balance-sheet
+├── General Ledger         /dashboard/ledgers/general-ledger
+├── Profit & Loss          /dashboard/ledgers/profit-and-loss
+├── Cash Flow              /dashboard/ledgers/cash-flow
+├── Budget vs Actual       /dashboard/ledgers/budget-vs-actual
+├── Tax Report             /dashboard/ledgers/tax-report          (new)
+└── Cash / Bank Accounts   /dashboard/ledgers/bank-accounts (+ /new)
+```
+
+`/dashboard/ledgers` itself is a card-grid hub, same pattern as `/dashboard/stock` — gains an 8th card.
+
+---
+
+## 2. Transport: a dedicated GL client, not `lib/api-client.ts`
+
+`lib/api/general-ledger.ts` is a **separate** fetch client from the one every other screen in this
+app uses (`lib/api-client.ts`'s `apiRequest`/`apiRequestWithETag`). Reason: those assume ERPCore's
+own RFC 7807 `ProblemDetails` error shape and a bare-DTO success body. The GL service wraps **every**
+response — success and error alike — in its own `{ statusCode, success, message, data }` envelope,
+and (a documented GL quirk, carried through the proxy unchanged per `docs/12` §4) success bodies are
+camelCase while error bodies are PascalCase. `glRequest()` unwraps both casings itself and throws a
+`GlApiError` shaped `{ status, detail }` — duck-type compatible with `lib/error-map.ts`'s
+`ApiErrorLike`, so `errorMessage()`/toasts work unchanged across both API surfaces.
+
+All calls are relative to `/api/v1/gl/*` — same-origin through the existing Next `rewrites()` proxy
+(`next.config.ts`) → ERPCore → the GL service. No new proxy config was needed, and **still isn't** for
+any of this revision's changes — ERPCore's `GeneralLedgerController` (docs/12) is a byte-for-byte
+passthrough that never inspects GL's own field names or report contents, so every rename/restructure
+described in this doc requires zero ERPCore-side change, only frontend-side (`docs/12` §4's new note
+on this).
+
+**No ETag/If-Match anywhere in this module** — the GL service's own reference documents no
+concurrency tokens on any of the endpoints this UI calls.
+
+---
+
+## 3. Reports: "Sri Lankan Standard" report UI
+
+Every report screen (`app/dashboard/ledgers/{trial-balance,balance-sheet,general-ledger,profit-and-loss,cash-flow,budget-vs-actual,tax-report}/page.tsx`)
+shares three building blocks:
+
+- **`components/reports/ReportHeader.tsx`** — a centered statutory header block: small-caps
+  "General Ledger" eyebrow, the report's **LKAS-aligned statement name** (not always GL's own
+  `reportType` value — see the mapping below), the as-at/for-period line, and a currency note. This
+  is the "Sri Lankan Standard report UI" requested: the on-screen equivalent of the formal
+  company-financial-statement layout (title block, period line, right-aligned money columns,
+  bold/indented subtotal rows), not a bespoke ad-hoc table per screen. **The Tax Report screen does
+  not use this component** — see its own entry below, it needs a fuller identity block GL's own PDF
+  gives that report alone.
+- **`components/reports/DownloadPdfButton.tsx`** — re-issues the *exact same* report call with
+  `outputFormat=Pdf` instead of `Json`, base64-decodes `data.contentBase64` client-side into a
+  `Blob`, and triggers a browser download.
+- **`components/reports/DownloadCsvButton.tsx`** *(new)* — identical mechanism, `outputFormat=Csv`
+  instead, `Blob` typed `text/csv`, triggers a `.csv` download. Sits next to the PDF button on every
+  screen — two download buttons now, not one. No proxy/transport concern either (`docs/12` §7) — same
+  passthrough as `Pdf` always was.
+
+| Screen | `reportType` | On-screen title | Required params | Response shape |
+|---|---|---|---|---|
+| Trial Balance | `TrialBalance` | Trial Balance | `asOfDate` | **Flat** array `{accountCode, accountName, debit, credit}` — no `depth` anymore |
+| Balance Sheet | `BalanceSheet` | Statement of Financial Position | `asOfDate` | Unchanged — hierarchical array `{depth, lineItem, accountType, balance}`, always ends with a synthetic `"Current Year Earnings"` row under Equity |
+| General Ledger | `GeneralLedger` | General Ledger | `periodStart`, `periodEnd` (`accountCode` optional — renamed from `accountId`, see below) | Unchanged shape |
+| Profit & Loss | `ProfitAndLoss` | Statement of Profit or Loss | `periodStart`, `periodEnd` | **Nested object**, not a flat array — named sections, see below |
+| Cash Flow | `CashFlow` | Statement of Cash Flows | `periodStart`, `periodEnd` | Nested object; `workingCapitalChanges[]` gained `direction`; `openingCashBalance`/`closingCashBalance` still returned, not displayed |
+| Budget vs Actual | `BudgetVsActual` | Budget vs Actual | `budgetId` | Unchanged |
+| Tax Report *(new)* | `TaxSummary` | Income Tax Computation | `periodStart`, `periodEnd`; optional `allowableDeductions`, `otherTaxableIncome`, `qualifyingPaymentsReliefs`, `surchargeAmount`, `taxRateOverride` | Single flat object, see below |
+
+**Defaults, so a screen is never blank on first load:** `asOfDate`/`periodEnd` default to today,
+`periodStart` to the 1st of the current month (`lib/format.ts`'s `todayIso`/`startOfMonthIso`) —
+these params are *required* by GL (400 if missing), so the UI always sends something sensible rather
+than erroring on mount. The Tax Report's five optional parameters get **no forced client-side
+default** — an untouched field sends nothing, letting GL's own server-side defaulting (`0` for four
+of them, `system_config`-driven for `qualifyingPaymentsReliefs`/the tax rate) be the single source of
+truth for what "not supplied" means.
+
+**`reportType`/`outputFormat` are TS enums** (`types/general-ledger.ts`'s `ReportType`,
+`ReportOutputFormat`) — `ReportOutputFormat` gains a `Csv` member. `GlAccount.accountTypeId` stays a
+`GlAccountTypeId` enum (`Asset=1`…`Expense=5`).
+
+**General Ledger: `accountId` renamed to `accountCode` (GL's `CLAUDE.md` Rule 8.2), behavior
+unchanged from the 2026-07-20 correction.** GL's own reference still documents two modes:
+`accountCode` supplied → "Account Ledger" (one account + its descendants, one running balance);
+`accountCode` omitted → the **true General Ledger**, every `is_postable` account's own transactions
+together, each with its own running balance that resets whenever the account changes, sorted by
+`accountCode` then `entryDate`. This screen still always calls the second mode —
+`reportsApi.generalLedger(periodStart, periodEnd)` never sends `accountCode` — and has no account
+picker/input, same as before; only the underlying param name the client would use *if* a
+single-account mode were ever added changed, not this screen's own behavior.
+
+**Amount formatting** (`lib/format.ts`): comma-grouped thousands + fixed 2 decimals + parentheses for
+negatives (`formatAmount`) — standard financial-statement convention. **CSV export does not reuse
+this formatter** — GL's own CSV cells are plain decimals with a leading minus sign, no thousands
+separator, no parentheses (spreadsheet-numeric-parsing convention, not human-display convention).
+`DownloadCsvButton` downloads GL's bytes unmodified, same "don't reshape what GL sent" posture as the
+PDF button.
+
+**Hierarchical rows:** Balance Sheet still carries `depth`, rendered with `depth`-proportional left
+padding. **Trial Balance dropped this entirely** — now a plain flat list, same row-component style as
+Budget vs Actual.
+
+**Profit & Loss is a nested object, not a flat array.** GL's response has named sections — `sales`,
+`costOfSales`, `otherIncome`, `distributionExpenses`, `administrationExpenses`, `otherExpenses`,
+`financialExpenses`, `unclassified` (only present with lines if the COA has untagged Income/Expense
+accounts — GL flags this as worth watching for during setup) — each `{ lines[], total }`, plus
+top-level `grossProfit`/`netProfitForPeriod`. The screen renders one bordered section per non-empty
+group, in this fixed order: Sales, Cost of Sales, **Gross Profit** (its own bold subtotal row, not a
+section), Other Income, the four expense groups, `unclassified` last if present, then **Net Profit
+for the Period**.
+
+**Cash Flow is a structured statement layout, not four `StatCard`s.** `Net Earnings` as its own line,
+an "Additions to Cash" bordered section and a "Subtractions From Cash" bordered section — client-side
+bucketed by sign from the combined `nonCashAdjustments[]` + `workingCapitalChanges[]` (a working-capital
+line's label uses its `direction` field, e.g. `direction: "Decrease"` + `accountName: "Trade
+Receivables"` → `"Decrease in Trade Receivables"`; a non-cash-adjustment line just prints its plain
+`description`, e.g. `"Depreciation"`, no Increase/Decrease prefix) — then `Net Cash From Operations`
+as a subtotal, Investing/Financing sections (their `lines[]`, no subtotal row when a section has only
+one line), ending in the final combined total. `openingCashBalance`/`closingCashBalance` are fetched
+(still in the response) but **not rendered anywhere on screen** — same "computed but not displayed"
+posture GL's own PDF/CSV takes.
+
+**Tax Report (`app/dashboard/ledgers/tax-report/page.tsx`) is an entirely new screen.** Layout:
+- A `periodStart`/`periodEnd` date-range picker, same component as every other period-based report.
+- **A collapsible "Adjustments" panel**, collapsed by default, with five optional numeric inputs —
+  `Allowable Deductions`, `Other Taxable Income`, `Qualifying Payments / Reliefs`,
+  `Surcharge / Education Levy`, and `Tax Rate Override` (%). Each maps directly to the report call's
+  optional query params.
+- Result: a two-column `Description`/`Amount` table in GL's own fixed order (`profitBeforeTax` through
+  `balanceTaxPayable`) — `Add:`/`Less:` prefixes are literal row labels the component renders per a
+  fixed lookup, not derived from the amount's sign. Bold rows for the reconciliation checkpoints
+  (`Adjusted Business Profit`, `Assessable Income`, `Taxable Income`, `Gross Tax Liability`, the final
+  total).
+- **The final row's label depends on the sign of `balanceTaxPayable`** — GL's own PDF renders a
+  negative value (credits/payments exceeded the gross liability) as **"BALANCE TAX REFUNDABLE"**, not
+  a negative "payable" figure (confirmed live on GL's own seeded loss-making test data,
+  `03_Progress_Tracker.md`). The on-screen table should match this exactly: `balanceTaxPayable >= 0` →
+  label `"BALANCE TAX PAYABLE"`, amount as-is; `balanceTaxPayable < 0` → label
+  `"BALANCE TAX REFUNDABLE"`, amount shown as its absolute value (not in parentheses — GL's own PDF
+  changes the *label*, not the sign display, for this one row specifically).
+- Uses its own header block, not the shared `ReportHeader` — GL's own PDF gives this one report a
+  fuller identity block (company name, address, TIN, BRN) via `Company:Address`/`Tin`/`Brn` config
+  values (`05_LKAS_Report_PDF_Templates.md` §0/§8, confirmed implemented server-side). **Open question,
+  genuinely unresolved:** GL exposes no endpoint returning these four values as data — they're
+  `appsettings.json` entries, read only by the PDF renderer. The on-screen React version needs the
+  *same* values from *somewhere*, and there's no way to fetch them from GL today. Two options, neither
+  picked here: (a) GL adds a small `GET /company-info`-style endpoint; (b) the frontend duplicates
+  these four values in its own config/env, accepting the risk of drifting out of sync with GL's
+  `appsettings.json` whenever one side changes without the other. Flag this for a decision before
+  building this screen's header — don't silently pick one.
+
+---
+
+## 4. Cash / Bank Accounts
+
+`app/dashboard/ledgers/bank-accounts/page.tsx` (list) + `/new/page.tsx` (create). No delete — GL's
+own reference has no delete endpoint for either concept, consistent with every other master in this
+system (FR-MD-08's deactivate-not-delete posture, though GL doesn't even expose deactivate here).
+
+**Rework — Cash and Bank are separate GL tables/endpoints, not one table with a type field.** An
+earlier design (drafted, never shipped on GL's side) proposed a single `bank_account.accountType`
+discriminator; GL's team judged a cash account a *peer* concept to a bank account, not a *kind of*
+bank account, and built two separate tables instead (`Accounting_System_Design_LKAS.md` §5.8). This
+still satisfies the original requirement — **the create page only ever offers exactly two choices,
+Cash or Bank, nothing else** — the two-choice constraint now lives in "which endpoint does the form
+submit to," not "which value of a discriminator field."
+
+### The three endpoints this page now uses
+
+- **`POST /bank-accounts`** — unchanged in shape from the original 2026-07-18 design, except
+  `glAccountId` → `glAccountCode` (Rule 8.2). Fields: `accountName` (required), `bankName`/
+  `accountNumber` (both optional/nullable — a Bank account can genuinely be created with these blank
+  and filled in later, unlike Cash's stricter rule below), `glAccountCode` (required), `currencyCode`
+  (optional, defaults `"LKR"`).
+- **`POST /cash-accounts`** *(new)* — `accountName` (required), `cashAccountTypeName` (required —
+  matched case-insensitively against GL's `cash_account_type` reference table; a name with no
+  existing match **creates a new type on the fly**, so a frontend "Other, please specify" free-text
+  option becomes a permanent selectable choice for every future cash account created after it),
+  `accountNumber` (**optional** — if omitted, GL auto-generates a sequential `CASH-000001`-style
+  reference; if supplied, used as entered), `glAccountCode` (required), `currencyCode` (optional,
+  defaults `"LKR"`).
+- **`GET /cash-account-types`** *(new)* — flat, unfiltered list, seeded with Petty Cash / Till Cash /
+  Safe Cash / Cash in Transit, growing over time. Feeds the create form's Cash Account Type dropdown.
+
+### Create form
+A **two-choice toggle** at the top — **Cash** or **Bank**, backed by a `CashBankAccountType` TS enum
+(`Cash`/`Bank`) — decides which of the two fieldsets below shows and which endpoint the form submits
+to:
+
+- **Bank selected:** Bank Name + Account Number fields (both optional on this side — GL doesn't
+  enforce them as required for a Bank row), submits to `POST /bank-accounts`.
+- **Cash selected:** a Cash Account Type `<Select>` fed by `GET /cash-account-types`, with an "Other,
+  please specify" option that reveals a free-text input — its value is sent as `cashAccountTypeName`
+  regardless of whether it matched an existing type or not, letting GL's own on-the-fly-creation
+  handle the rest (no separate "create type first, then create account" round trip needed on the
+  frontend's part). An optional Account Number field, with placeholder text noting it'll be
+  auto-generated if left blank. Submits to `POST /cash-accounts`.
+- `glAccountCode` (required regardless of type, references GL's own Chart of Accounts) stays a
+  `code — name` picker fed by `glAccountsApi.list()` (`GET /accounts`) either way — both kinds still
+  need a linked GL account, nothing about that requirement differs by type.
+
+### List page — now a unified, filterable view
+`GET /bank-accounts?accountType=Cash|Bank|Both` (default `Both`) replaces the old
+"flat, unfiltered, unpaginated bank-accounts-only" list — it's GL's own server-side union of both
+tables now, not a client-side-only filter over one table. Response per row:
+`{ accountType, accountId, accountName, bankName, cashAccountTypeName, accountNumber, glAccountId,
+currencyCode, createdAt }` — `bankName` is `null` on `Cash` rows, `cashAccountTypeName` is `null` on
+`Bank` rows. The list table should show an `accountType` badge/column per row (a small "Cash"/"Bank"
+pill next to the account name) so the two kinds are visually distinguishable at a glance. Client-side
+filters (name/bank-or-type/account-number/currency/linked-GL-code) still layer on top of whichever
+server-side `accountType` filter is active — GL's own filter narrows which table(s) contribute rows;
+everything else about the existing client-side filtering approach is unchanged.
+
+### Known gap — edit, still unresolved
+**The user-facing requirement was list → create → edit (no delete). Edit still cannot be built.** GL's
+own reference documents no `GET`/`PUT` by id for either `bank_account` or `cash_account` — nothing to
+edit against, for either kind. The list page shows a **disabled** Edit button with a tooltip
+explaining the gap, same posture as before this rework. **This needs a GL service change** (add the
+missing endpoints, for both tables now, not just one) before a real edit screen can exist.
+
+### Known gap — response shape, now resolved for Bank, still open for the unified list's exact field names
+GL's reference previously never showed a full bank-account response body (only the create request
+fields), so `types/general-ledger.ts`'s old `BankAccount` interface was an **inferred** shape. This is
+now resolved for the unified list — `GET /bank-accounts`'s response fields are explicitly documented
+(above) — but double-check the exact TS interface against a live call before trusting it blindly;
+inferred-shape mistakes have been a real, repeated source of drift in this module (`§6`'s history).
+
+### Fixed — selected GL account showed as a raw number, not its name (2026-07-20, unaffected by this rework)
+The `<Select>` picker (bank account form, and Budget vs Actual's budget picker) displayed the
+selected item's **numeric value** after picking it, even though the correct id/code was genuinely
+being sent to the server. Cause: this app's `<Select>` wraps `@base-ui/react/select`, whose
+`Select.Value` resolves its displayed text from each `Select.Item`'s **`label` prop**, a separate
+field from `children`. Fixed by passing `label={...}` explicitly on each `<SelectItem>`. **Not fixed
+at the shared `components/ui/select.tsx` level** — flagged for whoever next touches a similar picker
+elsewhere in the app. The new Cash Account Type picker (this rework) should apply the same
+`label={...}` pattern from the start, not reintroduce the bug.
+
+---
+
+## 4a. Accounts section (2026-07-31) — Cheque Management (new module) + Cash/Bank Accounts moved here
+
+**A new top-level sidebar item, "Accounts"** (`app/dashboard/accounts/*`), sitting alongside
+"Ledgers" rather than under it — Cash/Bank Accounts and cheques are operational account
+bookkeeping, not a statutory report, so they don't belong under the Ledgers report hub. **Cash /
+Bank Accounts moved here verbatim** from `ledgers/bank-accounts` (§4 above) — same code, same
+behavior, just relocated; the Ledgers hub's card grid dropped its Cash/Bank Accounts card
+accordingly.
+
+**Cheque Management** is a new GL module (`04_API_Reference_And_Scenarios.md`, Module: Cheque
+Management — added to GL 2026-07-30, beyond its original plan), purely operational tracking: no
+endpoint in it ever creates or touches a journal entry itself. Two independent sub-areas, per GL's
+own spec:
+
+- **Cheque Books/Pages** (`app/dashboard/accounts/cheque-books/*`) — cheques issued from this
+  company's own cheque book supply. `POST /cheque-books` auto-generates every leaf (`ChequePage`,
+  all `Unused`) in one call. List page filters by status; create form restricts the bank-account
+  picker to `Bank`-type accounts only (GL's own module note: cheque books are bank-account-only,
+  never cash-account). Clicking a book navigates to `[chequeBookNo]/page.tsx`, which fetches
+  `GET /cheque-books/{chequeBookNo}?expand=pages` and lists every leaf — clicking a leaf opens
+  `components/accounts/ChequePageDialog.tsx`.
+- **Received Cheques** (`app/dashboard/accounts/received-cheques/*`) — cheques received from
+  customers/suppliers/others, deliberately **not** linked to any `ChequeBook`. Same list-then-modal
+  shape via `components/accounts/ReceivedChequeDialog.tsx`.
+
+**Modal chosen over a second-level page for leaf/row details** (left open by the request) — working
+through several cheque pages in one book, or several received cheques in the list, without losing
+the list's scroll position/filter state each time. Each dialog shows read-only details plus only the
+actions valid from the item's current status (per GL's own status-transition tables), and each
+action reveals only the extra fields *that specific transition* needs — e.g. `Clear` asks for
+`clearedDate`, `Cancel` asks for `cancelReason`, `Bounce`/`Void`/`Deposit`(+bank picker) need
+nothing else beyond an optional `performedBy`/note. This mirrors GL's own validation exactly rather
+than showing one giant always-visible form.
+
+**`branchId`/`companyId`/`payeeId`/`voucherId`/`referenceId` are plain numeric inputs, not
+dropdowns** — GL's reference explicitly documents these as "loose references" (no Branch/Company/
+Customer/Supplier table exists in that service for them to point at), so building a picker against
+non-existent master data would be worse than a labeled numeric field.
+
+**Types built from request-body fields GL does document, not guessed wholesale** — `ChequeBook`/
+`ChequePage`/`ReceivedCheque` in `types/general-ledger.ts` are assembled from every field named in
+the `POST`/`PUT` request bodies plus the status fields GL's prose confirms (`issueStatus`/
+`printedAt`/`clearedDate`/`clearedByBank`/`cancelReason`, etc.) — not a shape invented from nothing.
+Two things genuinely are guesses, flagged in the type comments: `ChequeBook`/`ChequePage`'s internal
+numeric PK column names (GL never states them — `chequeBookNo`/`chequeNo`, both explicitly
+documented as the identifying route values, are used for every key/URL instead, sidestepping the
+guess), and `ReceivedCheque`'s JSON id field name (`receivedChequeId`, inferred from this project's
+own `<entity>Id` convention — GL's reference only shows a numeric `{id}` in the URL, not the field
+name).
+
+**Backend:** migration `AddAccountsNavSeed` — new `NavItem` `accounts` (id 12) and two new
+`SubNavItem`/`Permission` pairs (`accounts.cheque-books`, `accounts.received-cheques`); the existing
+Cash/Bank Accounts `SubNavItem`/`Permission` (ids 15/26) were **updated in place**, not deleted and
+recreated, so a role already granted that permission under its old `ledgers.bank-accounts` code
+keeps it. Applied to the live database this session.
+
+**Not done — live smoke test.** This entire module (both sub-areas) is unverified against real
+Cheque Management data — no running GL instance with cheque data was available this session. Same
+"verify before trusting the inferred pieces" posture as the rest of `§6`'s history.
+
+---
+
+## 5. RBAC nav seed (backend, small, additive)
+
+The sidebar's role-based visibility (`docs/10 C.8`, `GET /auth/me`'s `navCodes`) requires every
+`AppSidebar.tsx` entry's `code` to have a matching backend `NavItem`/`SubNavItem` row, or the item is
+invisible to every role regardless of the frontend change. Migration `AddLedgersNavSeed`,
+`Backend/ERPCore/Infra/Persistence/Migrations`:
+
+- `NavItem` `ledgers` (id 11) + **8** `SubNavItem` rows (`ledgers.trial-balance` … `ledgers.tax-report`
+  (new, id 16) … `ledgers.bank-accounts`, ids 9–16) — `NavItemConfiguration.cs`/`SubNavItemConfiguration.cs`.
+- **9** matching `Permission` rows (`NAV:ledgers`, `NAV:ledgers.*`, ids 19–27, `NAV:ledgers.tax-report`
+  new at id 27) — `PermissionConfiguration.cs`, following the existing one-`Permission`-per-nav-entry
+  convention exactly.
+
+**Operational step still needed, not code:** a brand-new `NavItem`/`SubNavItem` carries no
+`RolePermission` grants by default. An administrator must open **Settings → Roles**, edit the relevant
+role(s), and check the new Ledgers permissions (including the new Tax Report one) before anyone with
+that role sees the sidebar entries — normal onboarding, not a bug.
+
+---
+
+## 6. Progress
+
+- [x] **Reports, original 6 screens (2026-07-20):** all 6 report screens + hub, all calling the live
+  GL proxy, all with a working PDF download. Verified `tsc --noEmit`/`eslint` clean.
+- [x] **Cash/Bank Accounts — list + create, original single-table design (2026-07-20):**
+  client-side-filtered list, create form with a GL-account picker.
+- [x] **RBAC nav seed, original 7-entry version (2026-07-20):** migration `AddLedgersNavSeed`, not yet
+  applied to a live database.
+- [x] **Corrections (2026-07-20):** General Ledger dropped `accountId` entirely (later renamed to
+  `accountCode`, see below), `ReportType`/`ReportOutputFormat`/`GlAccountTypeId` became TS enums,
+  fixed the Select-shows-raw-number bug on two pickers.
+- [x] **This revision, built (2026-07-30).** Every item in §3/§4's rework is now implemented against
+  the frontend codebase:
+  - `components/reports/DownloadCsvButton.tsx` — new, added to all seven report screens (alongside
+    the existing `DownloadPdfButton`).
+  - `components/reports/ReportSection.tsx`/`ReportSubtotal.tsx` — new shared components, extracted
+    because Profit & Loss and Cash Flow both needed the identical "bordered section of lines + a
+    bold subtotal row" shape; not built as one-off per-screen markup.
+  - Trial Balance screen — flat-list renderer, `depth`/`indentedCode` dropped.
+  - Profit & Loss screen — full rework to the nested-sections object, fixed section order (Sales →
+    Cost of Sales → **Gross Profit** → Other Income → the four expense groups → Unclassified if
+    present → **Net Profit for the Period**), empty sections hidden.
+  - Cash Flow screen — replaced the four `StatCard`s with the structured statement layout: Net
+    Earnings, Additions/Subtractions to Cash (sign-bucketed from the combined
+    `nonCashAdjustments[]`/`workingCapitalChanges[]`, working-capital lines labeled via their
+    `direction`), Net Cash From Operations, Investing/Financing sections (subtotal row suppressed
+    when a section has exactly one line, per spec), final combined total.
+    `openingCashBalance`/`closingCashBalance` are fetched but deliberately not rendered.
+  - **New Tax Report screen** (`app/dashboard/ledgers/tax-report/page.tsx`) — period picker,
+    collapsible Adjustments panel (5 optional numeric inputs, no client-side default), fixed-order
+    two-column result table with Add:/Less: row labels from a static lookup, bold reconciliation
+    checkpoints, and the payable/refundable label+sign logic on the final row. Uses its own header,
+    not the shared `ReportHeader` — the open question about `Company:Address`/`Tin`/`Brn` (§3, end)
+    is **still unresolved**; the header explicitly states the company-identity fields aren't shown
+    rather than fabricating placeholder values, and a hub card was added.
+  - `types/general-ledger.ts` — `ReportOutputFormat` gained `Csv`; `ReportType` gained `TaxSummary`;
+    `GeneralLedger`'s (unused-by-this-screen) param renamed `accountCode`; new `CashBankAccountType`
+    enum; `TrialBalanceRow` flattened; `ProfitAndLossResponse`/`CashFlowResponse`/`TaxSummaryResponse`
+    added (all three **inferred** in places GL's own reference doesn't spell out every field verbatim
+    — flagged in the type file's own doc comments, same posture as the original inferred
+    `BankAccount` shape); `BankAccount` replaced by the unified `CashAndBankAccountDto` plus separate
+    `CreateBankAccountRequest`/`CreateCashAccountRequest` types.
+  - Cash/Bank create form — Bank/Cash toggle (two buttons, not a dropdown), conditional fieldsets,
+    Cash Account Type `<Select>` (with `label={...}` set correctly from the start, avoiding the
+    raw-number-display bug from §4's earlier fix) fed by `GET /cash-account-types`, an "Other, please
+    specify" free-text option, `glAccountCode` picker now keyed by the account's code string instead
+    of its numeric id.
+  - Cash/Bank list page — server-side `accountType` filter (`Both`/`Bank`/`Cash`, a `<Select>` next
+    to the existing search box) driving `GET /bank-accounts?accountType=...`, client-side text search
+    still layered on top, a Cash/Bank badge column, Edit still disabled with its explanatory tooltip
+    (now type-aware: "...for cash accounts"/"...for bank accounts").
+  - RBAC nav seed — migration `AddTaxReportNavSeed` adds `SubNavItem` id 16
+    (`ledgers.tax-report`) and `Permission` id 27, and re-sequences `ledgers.bank-accounts`'s
+    `SortOrder` from 7→8 so Tax Report sits before it, matching the sidebar's array order.
+  - Verified: `tsc --noEmit` clean, `npx eslint` clean across every touched file, `npm run build`
+    succeeds with all 9 `/dashboard/ledgers/*` routes present (including `/tax-report`), `dotnet
+    build` clean (0 warnings/0 errors) after the migration.
+- [x] **Live smoke test, partial (2026-07-31) — Cash Flow crashed, now fixed.** A GL instance became
+  reachable and a user hit the exact risk flagged above: `Cash Flow` threw
+  `TypeError: Cannot read properties of undefined (reading 'map')` on `report.nonCashAdjustments.map`.
+  Confirmed root cause — **GL's serializer omits an empty/zero list or section field from the JSON
+  entirely, rather than sending `[]` or `{ lines: [], total: 0 }`.** Fixed in `cash-flow/page.tsx`
+  (`?? []` defaults, an `activitySectionLines()` helper, optional chaining on
+  `investingActivities`/`financingActivities`/their `.total`) and proactively in
+  `profit-and-loss/page.tsx` (same defensive treatment for every section, since
+  `ProfitAndLossResponse` shares the identical nested-section shape and hadn't crashed yet only
+  because no period tested so far happened to have an empty section). `types/general-ledger.ts`'s
+  `CashFlowResponse` and `ProfitAndLossResponse` fields changed from required to optional to match.
+  **`TaxSummaryResponse` is still unverified against this same risk** — it wasn't touched this pass;
+  treat it as equally likely to have optional/omittable fields until proven otherwise. The unified
+  `CashAndBankAccountDto` also remains unverified live.
+- [x] **Corrected against GL's own API reference (2026-07-31 (2)) — Cash Flow's shape was wrong, not
+  just fragile; Tax Report was missing five fields.** The user supplied GL's own
+  `04_API_Reference_And_Scenarios.md`, letting every report be checked against a confirmed contract
+  instead of inference for the first time. Trial Balance, Balance Sheet, General Ledger,
+  Profit & Loss, and Budget vs Actual all match it exactly. Two didn't:
+  - **`CashFlowResponse` — everything nests under `operatingActivities`.** There is no top-level
+    `netEarnings`/`nonCashAdjustments`/`workingCapitalChanges`/`netCashFromOperations` at all; the
+    real shape is `operatingActivities: { profitForPeriod, nonCashAdjustments[],
+    workingCapitalChanges[], netCashFromOperatingActivities }`, and `investingActivities`/
+    `financingActivities` each have their own differently-named total
+    (`netCashFromInvestingActivities`/`netCashFromFinancingActivities`), not a shared `total`. This
+    was the actual cause of the crash in the entry above — the previous fix's `?? []` guards were
+    aimed at fields that never existed at that nesting level, so the page would have kept silently
+    rendering an empty Operating Activities section forever, crash or not. Also: `workingCapitalChanges[]`
+    entries use `changeAmount`, not `amount`. Rewrote `cash-flow/page.tsx` and
+    `types/general-ledger.ts` (`CashFlowResponse` plus new `CashFlowOperatingActivities`/
+    `CashFlowInvestingActivities`/`CashFlowFinancingActivities`) to match exactly.
+  - **`TaxSummaryResponse` was missing `nonDeductibleExpenses`, `corporateIncomeTax`, `apitCredit`,
+    `whtCredit`, `quarterlyTaxPayments` entirely** — real GL-computed figures silently never shown,
+    not a wrong guess at a name. Added all five to the type and to `tax-report/page.tsx`'s `ROWS`
+    table in their correct position in the confirmed order.
+  - `CashFlowActivityLine`'s own field names (`{description, amount}` inside `investingActivities`/
+    `financingActivities` `lines[]`) and `CashAndBankAccountDto` remain unverified — GL's reference
+    confirms the containing shapes but not these inner fields verbatim.
+  - Verified: `tsc --noEmit`/`eslint` clean on every touched file.
+- [x] **Balance Sheet regrouped into a proper LKAS Statement of Financial Position layout
+  (2026-07-31 (3), user-reported).** `BalanceSheetRow`'s shape is correct (matches the reference
+  above exactly) — this was a presentation bug, not a data bug. The flat one-table rendering made a
+  rollup total visually indistinguishable from the leaf amounts it already sums (e.g. "Cash and
+  Bank"'s balance already includes "Petty Cash"/"Main Operating Bank Account"/"Savings Bank Account"
+  beneath it), only `depth===0` did any bolding, and there was no section grouping at all — a "Type"
+  column per row instead of an ASSETS/LIABILITIES/EQUITY structure. Rewrote `balance-sheet/page.tsx`
+  to group by `accountType` into sections, each with a bold "Total {Section}" row (summed from that
+  section's depth-0 rows only, since a depth-0 row's balance already rolls up its descendants), any
+  row followed immediately by a deeper row is bolded as a rollup (not just the top level), and a
+  final "Total Liabilities and Equity" row for the standard balance check. Handles one GL quirk
+  explicitly: the synthetic "Current Year Earnings" balancing row always carries `depth: 1` even
+  though it's a peer Equity entry, not a child of whatever precedes it — a new `effectiveDepth()`
+  helper special-cases it to 0. Verified against the actual reported numbers: Total Assets
+  (5,880,466.50) = Total Liabilities (2,025,000.00) + Total Equity (3,855,466.50), exact match.
+  `tsc --noEmit`/`eslint` clean.
+- [x] **Superseded by a real GL retrofit (2026-07-31 (4)) — `BalanceSheet` is now a pre-classified
+  nested shape, not a flat array to regroup client-side.** GL's own API reference documents a
+  2026-07-31 backend change: the flat `{depth, lineItem, accountType, balance}` recursive-rollup
+  array (what the entry above regrouped client-side) is replaced by
+  `{ asOfDate, nonCurrentAssets: {lines[], total}, currentAssets: {lines[], total},
+  unclassifiedAssets: {lines[], total}, totalAssets, equity: {lines[], total},
+  nonCurrentLiabilities: {lines[], total}, currentLiabilities: {lines[], total},
+  unclassifiedLiabilities: {lines[], total}, totalEquityAndLiabilities }`, driven by GL's new
+  `accounts.balance_sheet_classification` tag. GL now does the Non-Current/Current classification
+  itself — the previous entry's client-side `effectiveDepth`/`sectionTotal`/depth-based rollup
+  logic is entirely obsolete. Replaced `BalanceSheetRow` with `BalanceSheetLine`/
+  `BalanceSheetSection`/`BalanceSheetResponse` (every section optional, same defensive posture as
+  `CashFlowResponse`/`ProfitAndLossResponse` after the Cash Flow crash, since this shape isn't
+  live-verified against this frontend yet) and rewrote `balance-sheet/page.tsx` from scratch.
+  **Also restyled to match a user-supplied reference Statement of Financial Position image** — a
+  real classified SOFP, Non-Current/Current Assets each their own subtotaled block, then Equity and
+  Liabilities the same way, ending in a Total Assets vs Total Equity-and-Liabilities check — by
+  reusing the same `ReportSection`/`ReportSubtotal` components Profit & Loss and Cash Flow already
+  use, rather than one-off markup; line items show plain account names only, no codes, matching the
+  reference. Verified: `tsc --noEmit`/`eslint` clean; confirmed no remaining references to the
+  removed `BalanceSheetRow`.
+- [x] **New "Accounts" nav section built (2026-07-31 (5)) — Cheque Management (Cheque Books/Pages +
+  Received Cheques) plus Cash/Bank Accounts moved here from Ledgers.** Full detail: §4a above. Six
+  new screens (`cheque-books` list/create/detail, `received-cheques` list/create) plus two new
+  modal components (`ChequePageDialog`/`ReceivedChequeDialog`), new types/API client functions for
+  the whole Cheque Management module, migration `AddAccountsNavSeed` (applied live). Verified:
+  `tsc --noEmit`/`eslint` clean, `npm run build` compiles successfully. **Not done — live smoke
+  test**, this module's inferred id-field-name gaps are flagged in §4a.
+- [x] **`glAccountCode` removed from Cash/Bank Account creation (2026-07-31 (6)), matching a further
+  GL retrofit.** GL's own reference now documents that `POST /bank-accounts`/`POST /cash-accounts`
+  no longer accept a `glAccountCode` at all — the backing GL account (and, for Cash, its type-header
+  node) is always auto-created server-side, never caller-selected. Removed the field from
+  `CreateBankAccountRequest`/`CreateCashAccountRequest`, deleted the "GL account" `Select` and its
+  `glAccountsApi.list()` fetch from `bank-accounts/new/page.tsx` entirely, and dropped the matching
+  check from `validateBankAccountForm`. The create response is typed as the new
+  `CreateCashOrBankAccountResponse` (`glAccount` nested, confirmed from the doc; other fields
+  inferred) so the success toast can show the auto-generated GL account code back to the user. The
+  Cash/Bank **list** page is unaffected — GL's unified list endpoint still returns a flat
+  `glAccountId` per row, still resolved against `glAccountsApi.list()` there, same as before.
+- [x] **Create-form layout widened to fill the page (2026-07-31 (6)).** The three GL create forms
+  under Accounts (`bank-accounts/new`, `cheque-books/new`, `received-cheques/new`) each wrapped
+  their fields in a `max-w-lg` card, leaving roughly half the page blank on any normal desktop
+  width. Dropped the `max-w-lg` cap (now full-width, matching the report pages' own `rounded-2xl
+  bg-white p-6 ...` card convention, which was never capped) and replaced the vertical
+  one-field-per-row `FieldGroup` stacking (plus occasional ad-hoc `grid grid-cols-2` pairs) with one
+  consistent `grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3` wrapper per form, so fields actually
+  spread across the available width instead of stretching a single narrow column. Modals
+  (`ChequePageDialog`/`ReceivedChequeDialog`) were deliberately left at their existing fixed width —
+  a dialog is supposed to stay narrow, this complaint was about full-page create forms only.
+- [ ] **Not done — internal ERPCore→GL wiring.** Unrelated to this revision, still deferred
+  (`docs/12` §6).
+- [ ] **Deferred — bank/cash account edit.** Needs GL service changes first (§4); now needs them for
+  *both* tables, not just one.
+- [ ] **Open — Tax Report's company-identity header fields.** Still genuinely unresolved (§3, end);
+  not picked in this pass either. The screen ships without them rather than guessing.
+
+---
+
+*End of 21-GENERAL-LEDGER-FRONTEND.md. Transport: `docs/12-GENERAL-LEDGER-INTEGRATION.md`. General frontend rules: `20-FRONTEND.md`. Record work: `Frontend/PROGRESS.md`.*
diff --git a/docs/SALES_MODULE_PLAN.md b/docs/SALES_MODULE_PLAN.md
new file mode 100644
index 0000000..c37dc9e
--- /dev/null
+++ b/docs/SALES_MODULE_PLAN.md
@@ -0,0 +1,455 @@
+# Sales Module Plan
+
+## Summary
+This sales module is split into two phases:
+- **Phase 1**: basic, standard sales features that fit the current ERP architecture
+- **Phase 2**: enterprise extensions that can be added after the core flow is stable
+
+The design stays aligned with the existing backend patterns:
+- controller thinness
+- service-based business rules
+- repository + unit of work
+- ETag concurrency
+- audit logging
+- stock FIFO and ledger posting
+
+Returns, credit notes, and sales returns are **out of scope for Phase 1**.
+
+### Current Implementation Status
+The Phase 1 core is implemented and wired across the backend and frontend for:
+- sales invoices
+- sales slips
+- free issues as a slip alias
+- bundle sales
+- sales posting to stock/FIFO
+
+Shared backend services now centralize the repeated sales logic:
+- sales validation and pricing
+- sales posting checks and FIFO outbound posting
+- invoice/slip mapping and totals
+- shared draft edit/load workflow checks
+
+Still intentionally separate:
+- bundle pricing and bundle margin behavior
+- production and GRN as upstream stock/cost sources
+- reservation/backorder flow
+- sales reports visibility in the frontend UI, which is currently hidden from the navigation but still implemented in the backend
+
+---
+
+## Phase 1 - Basic Standard Sales Module
+
+### Goal
+Implement the minimum sales flow needed for both B2B and B2C:
+- maintain customers
+- create sales invoices
+- create sales slips
+- support fixed sale price fallback and GRN-based cost fallback
+- support discounts by percentage and value
+- support free issue lines
+- post stock movement and ledger entries
+- generate basic sales reports
+
+### In Scope
+- Customer master
+- Sales invoice
+- Sales invoice lines
+- Sales slip
+- Sales slip lines
+- Pricing resolver
+- Discount calculation
+- Free issue handling
+- Stock posting
+- Basic sales reports
+
+### Implemented Shared Services
+- `ISalesDomainService`
+  - header validation
+  - line validation
+  - price resolution
+  - line financial computation
+  - stock-item classification
+- `ISalesPostingService`
+  - invoice/slip/bundle posting checks
+  - shared FIFO posting for stocked items
+- `ISalesMappingService`
+  - invoice/slip totals mapping
+  - invoice/slip DTO mapping
+- `ISalesDocumentWorkflowService`
+  - shared editable-document load and concurrency checks for invoice/slip draft updates
+
+### Not in Scope for Phase 1
+- customer groups
+- price lists
+- promotions
+- reservations
+- sales payments allocation
+- approval workflow
+- returns and credit notes
+- advanced customer segmentation
+- fully unified sales provenance tracing across production, GRN, and sales documents
+
+### Phase 1 Entity Design
+
+#### `Customer`
+Basic customer master used for both B2B and B2C.
+
+Fields:
+- `CustomerId`
+- `CustomerCode`
+- `CustomerType` (`B2B`, `B2C`, `WalkIn`)
+- `Name`
+- `DisplayName`
+- `Phone`
+- `Email`
+- `AddressLine1`
+- `AddressLine2`
+- `City`
+- `Country`
+- `TaxRegistrationNo`
+- `CreditLimit`
+- `CreditDays`
+- `DefaultWarehouseId`
+- `Status`
+- `CreatedAt`
+- `UpdatedAt`
+- `RowVersion`
+
+#### `SalesInvoice`
+Primary posted sales document.
+
+Fields:
+- `SalesInvoiceId`
+- `InvoiceNo`
+- `InvoiceDate`
+- `CustomerId`
+- `CustomerSnapshotName`
+- `CustomerSnapshotTaxNo`
+- `WarehouseId`
+- `InvoiceType` (`B2B`, `B2C`, `Cash`, `Credit`)
+- `Status` (`Draft`, `Posted`, `Cancelled`)
+- `Subtotal`
+- `DiscountTotal`
+- `TaxTotal`
+- `GrandTotal`
+- `RoundOff`
+- `NetPayable`
+- `PaidAmount`
+- `BalanceAmount`
+- `CreatedBy`
+- `CreatedAt`
+- `UpdatedAt`
+- `RowVersion`
+
+#### `SalesInvoiceLine`
+Invoice line with pricing, discount, and free issue support.
+
+Fields:
+- `SalesInvoiceLineId`
+- `SalesInvoiceId`
+- `ItemId`
+- `Description`
+- `Qty`
+- `FreeQty`
+- `UomId`
+- `WarehouseId`
+- `UnitPrice`
+- `BaseCost`
+- `PriceSource`
+- `DiscountPct`
+- `DiscountAmount`
+- `NetUnitPrice`
+- `LineTotal`
+- `TaxPct`
+- `TaxAmount`
+- `IsFreeIssue`
+- `ParentLineId`
+- `RowVersion`
+
+#### `SalesSlip`
+Fast retail or counter-sale document.
+
+Fields:
+- `SalesSlipId`
+- `SlipNo`
+- `SlipDate`
+- `CustomerId`
+- `CustomerSnapshotName`
+- `WarehouseId`
+- `CashierUserId`
+- `Status`
+- `Subtotal`
+- `DiscountTotal`
+- `TaxTotal`
+- `GrandTotal`
+- `PaidAmount`
+- `BalanceAmount`
+- `CreatedAt`
+- `UpdatedAt`
+- `RowVersion`
+
+#### `SalesSlipLine`
+Slip line with the same sales calculation rules as invoices.
+
+Fields:
+- `SalesSlipLineId`
+- `SalesSlipId`
+- `ItemId`
+- `Description`
+- `Qty`
+- `FreeQty`
+- `UomId`
+- `WarehouseId`
+- `UnitPrice`
+- `BaseCost`
+- `PriceSource`
+- `DiscountPct`
+- `DiscountAmount`
+- `NetUnitPrice`
+- `LineTotal`
+- `TaxPct`
+- `TaxAmount`
+- `IsFreeIssue`
+- `ParentLineId`
+- `RowVersion`
+
+### Phase 1 Pricing Rule
+Use the following order:
+1. fixed `Item.SalePrice`
+2. GRN-derived stock cost fallback
+3. FIFO valuation fallback
+
+Important:
+- use a weighted average when deriving from multiple GRNs
+- keep the resolved source in `PriceSource`
+- allow manual override only if permitted by business rule
+
+### Phase 1 Discount Rule
+Support:
+- percentage discount
+- fixed value discount
+
+Discount must be computed server-side and stored in line and document totals.
+
+### Phase 1 Free Issue Rule
+Support free issue lines in the same invoice/slip document.
+
+Rules:
+- free quantity must be separate from paid quantity
+- free issue still reduces stock
+- free issue must be visible in reports
+- free issue should not be merged into discount
+
+### Phase 1 Stock Posting Rule
+When an invoice or slip is posted:
+- reduce stock from the selected warehouse
+- consume FIFO layers
+- write `StockLedger` rows
+- maintain source document traceability
+- update totals in the same transaction
+
+Sales document provenance is stored by document family:
+- `SalesInvoice` / `SalesInvoiceLine`
+- `SalesSlip` / `SalesSlipLine`
+- `BundleSale` / `BundleSaleLine`
+
+Inventory movement provenance is stored in:
+- `StockLayer`
+- `StockLedger` via `SourceDocType` / `SourceDocId`
+- `JournalEntryStub` via `SourceDocType` / `SourceDocId`
+
+Upstream cost/availability sources remain:
+- `Grn` / `GrnLine` for inbound purchasing cost
+- `ProductionRun` and stage tables for finished-goods production cost
+
+### Phase 1 API Route List
+- `GET /api/v1/customers`
+- `GET /api/v1/customers/{id}`
+- `POST /api/v1/customers`
+- `PUT /api/v1/customers/{id}`
+- `PATCH /api/v1/customers/{id}/status`
+- `GET /api/v1/sales-invoices`
+- `GET /api/v1/sales-invoices/{id}`
+- `POST /api/v1/sales-invoices`
+- `PUT /api/v1/sales-invoices/{id}`
+- `POST /api/v1/sales-invoices/{id}/post`
+- `POST /api/v1/sales-invoices/{id}/cancel`
+- `GET /api/v1/sales-invoices/{id}/print-preview`
+- `GET /api/v1/sales-slips`
+- `GET /api/v1/sales-slips/{id}`
+- `POST /api/v1/sales-slips`
+- `POST /api/v1/sales-slips/{id}/post`
+- `POST /api/v1/sales-slips/{id}/cancel`
+- `GET /api/v1/free-issues`
+- `GET /api/v1/free-issues/{id}`
+- `POST /api/v1/free-issues`
+- `PUT /api/v1/free-issues/{id}`
+- `POST /api/v1/free-issues/{id}/post`
+- `POST /api/v1/free-issues/{id}/cancel`
+- `GET /api/v1/reports/sales`
+- `GET /api/v1/reports/sales/{reportId}`
+- `POST /api/v1/reports/sales/query`
+
+Note:
+- the sales report backend routes remain implemented
+- the frontend report entry points are currently hidden from navigation, but the screens and API contracts still exist
+
+### Phase 1 Folder / Module Plan
+- `Domain/Entities`
+  - add `Customer`, `SalesInvoice`, `SalesInvoiceLine`, `SalesSlip`, `SalesSlipLine`
+- `Domain/Enums`
+  - add sales status enums and invoice/slip type enums
+- `Dtos/Sales`
+  - add request and response DTOs for customer, invoice, slip, and reports
+- `Services/Interfaces`
+  - add `ICustomerService`, `ISalesInvoiceService`, `ISalesSlipService`, `ISalesPricingService`, `ISalesReportService`
+- `Services`
+  - implement the sales services with transaction-safe logic
+- `Controllers`
+  - add `CustomersController`, `SalesInvoicesController`, `SalesSlipsController`, `SalesReportsController`
+- `Infra/Persistence/Configurations`
+  - add EF Core mappings for all sales entities
+- `Infra/Persistence/ErpDbContext.cs`
+  - register sales `DbSet`s
+- `Infra/Persistence/Migrations`
+  - add the sales schema migration after the model is defined
+
+### Phase 1 Implementation Order
+1. Customer master
+2. Sales invoice entity and DTOs
+3. Sales slip entity and DTOs
+4. Pricing resolver
+5. Discount computation
+6. Free issue handling
+7. Stock posting
+8. Basic sales reports
+9. Controllers and swagger wiring
+
+---
+
+## Phase 2 - Enterprise Extensions
+
+### Goal
+Add richer commercial features after Phase 1 is stable and tested.
+
+### In Scope
+- customer groups
+- price lists
+- promotions
+- free issue schemes
+- bundle sales templates
+- bundle sales documents
+- reservations
+- payment allocation
+- approval flow
+- advanced reporting dimensions
+
+### Phase 2 Entity Additions
+
+#### `CustomerGroup`
+Used only if group-level pricing or segmentation is needed.
+
+#### `PriceList`
+Customer, group, warehouse, or global price policies.
+
+#### `PriceListItem`
+Per-item pricing rows inside a price list.
+
+#### `Promotion`
+Promotional header.
+
+#### `PromotionRule`
+Buy-X-get-Y, discount, or reward rules.
+
+#### `BundleSaleTemplate`
+Fixed bundle composition definition.
+
+#### `BundleSaleTemplateLine`
+Component stock items and quantities inside a bundle template.
+
+#### `BundleSale`
+Posted or draft bundle sale header.
+
+#### `BundleSaleLine`
+Component lines expanded from a bundle template.
+
+#### `FreeIssueScheme`
+Separate free issue header.
+
+#### `FreeIssueSchemeLine`
+Rule lines for free issue behavior.
+
+#### `SalesReservation`
+Stock reservation header for B2B order fulfillment.
+
+#### `SalesReservationLine`
+Reserved item quantities.
+
+#### `SalesPayment`
+Payment header for cash or credit settlement.
+
+#### `SalesPaymentAllocation`
+Allocation of a payment across invoices.
+
+### Phase 2 API Routes
+- `GET /api/v1/customer-groups`
+- `POST /api/v1/customer-groups`
+- `PUT /api/v1/customer-groups/{id}`
+- `PATCH /api/v1/customer-groups/{id}/status`
+- `GET /api/v1/price-lists`
+- `POST /api/v1/price-lists`
+- `PUT /api/v1/price-lists/{id}`
+- `PATCH /api/v1/price-lists/{id}/status`
+- `GET /api/v1/price-lists/{id}/items`
+- `PUT /api/v1/price-lists/{id}/items`
+- `GET /api/v1/pricing/resolve`
+- `GET /api/v1/promotions`
+- `POST /api/v1/promotions`
+- `PUT /api/v1/promotions/{id}`
+- `PATCH /api/v1/promotions/{id}/status`
+- `GET /api/v1/free-issue-schemes`
+- `POST /api/v1/free-issue-schemes`
+- `PUT /api/v1/free-issue-schemes/{id}`
+- `PATCH /api/v1/free-issue-schemes/{id}/status`
+- `POST /api/v1/sales-orders`
+- `POST /api/v1/sales-orders/{id}/reserve`
+- `POST /api/v1/sales-orders/{id}/confirm`
+- `POST /api/v1/sales-payments`
+- `POST /api/v1/sales-payments/{id}/allocate`
+- extended reporting routes for channel, cashier, tax, and credit views
+
+### Phase 2 Folder / Module Plan
+- extend the same sales folders rather than creating a separate module
+- add new entities and DTOs under the same sales namespace
+- add new service interfaces and service implementations next to Phase 1 sales services
+- add new controllers only for the advanced routes
+- add migrations incrementally so Phase 1 tables remain stable
+
+### Phase 2 Implementation Order
+1. customer groups
+2. price lists
+3. promotions and free issue schemes
+4. sales orders and reservations
+5. payments and allocations
+6. advanced reports
+7. permissions and approval workflow
+
+---
+
+## Test Plan
+- Verify customer CRUD with ETag concurrency and status changes.
+- Verify invoice and slip create/update/post flows.
+- Verify fixed sale price fallback works.
+- Verify GRN-derived fallback uses weighted average.
+- Verify discounts calculate correctly by percentage and fixed value.
+- Verify free issue lines post stock and appear in reports.
+- Verify stock ledger entries are created once per posted document.
+- Verify the frontend sales hub and sidebar only expose invoice, slip, and free-issue entry points while report pages remain reachable directly.
+- Verify Phase 1 routes remain stable before Phase 2 is added.
+
+## Assumptions
+- Phase 1 is intentionally minimal and should not include customer groups or price lists.
+- `SalesInvoice` is the primary posted sales document.
+- `SalesSlip` is a simplified retail document.
+- Returns are deferred to a later step.
+- Existing ERP patterns must be preserved: repository, unit of work, audit, ETag, and FIFO stock posting.