gitea work flow update

Merge pull request 'Dev' (#62 ) from Dev into production
Reviewed-on: #62
2026-09-17 12:28:31 +05:30 · 2026-09-17 05:58:25 +00:00 · 2026-09-17 05:57:56 +00:00 · 2026-09-17 11:25:33 +05:30 · 2026-09-17 11:25:33 +05:30 · 2026-09-16 18:47:15 +00:00
219 changed files with 89117 additions and 1636 deletions
@@ -0,0 +1,102 @@
+name: CI/CD - ERP Core Monorepo
+
+on:
+  pull_request:
+    branches:
+      - Production
+    types:
+      - closed
+
+jobs:
+  backend-build-and-deploy:
+    name: Build & Deploy ERP Core Backend
+    runs-on: linux
+    if: github.event.pull_request.merged == true
+    steps:
+      - name: Checkout code
+        run: |
+          git clone \
+            --depth 1 \
+            --branch Production \
+            https://oauth2:${{ secrets.ERPCORE }}@gitea.hexdive.com/New_REP_SYSTEM/ERP-core.git \
+            .
+
+      - name: Restore backend
+        run: dotnet restore Backend/ERPCore.sln
+
+      - name: Publish backend
+        run: |
+          rm -rf /tmp/erpcore-deploy
+          mkdir -p /tmp/erpcore-deploy
+          dotnet publish Backend/ERPCore/ERPCore.csproj \
+            -c Release \
+            -r linux-x64 \
+            --self-contained true \
+            -o /tmp/erpcore-deploy
+
+      - name: Stop backend service
+        run: systemctl stop erpcore.service
+
+      - name: Copy backend to deploy folder
+        run: |
+          mkdir -p /home/erp/core/publish
+          rm -rf /home/erp/core/publish/*
+          cp -r /tmp/erpcore-deploy/* /home/erp/core/publish/
+
+      - name: Fix backend ownership and permissions
+        run: |
+          chown -R erpcore:erpcore /home/erp/core/publish
+          find /home/erp/core/publish -type d -exec chmod 755 {} +
+          find /home/erp/core/publish -type f -exec chmod 644 {} +
+          chmod +x /home/erp/core/publish/ERPCore
+
+      - name: Restart backend service
+        run: systemctl restart erpcore.service
+
+      - name: Verify backend
+        run: |
+          systemctl is-active erpcore.service && echo "Backend service running" || echo "Backend service failed"
+
+  frontend-build-and-deploy:
+    name: Build & Deploy ERP Core Frontend
+    runs-on: linux
+    needs: backend-build-and-deploy
+    if: github.event.pull_request.merged == true
+    steps:
+      - name: Checkout code
+        run: |
+          git clone \
+            --depth 1 \
+            --branch Production \
+            https://oauth2:${{ secrets.ERPCORE }}@gitea.hexdive.com/New_REP_SYSTEM/ERP-core.git \
+            .
+
+      - name: Build frontend Docker image
+        run: docker build -t erpcore-frontend:latest Frontend/erp-system
+
+      - name: Stop & remove existing frontend container
+        run: |
+          docker stop erpcore-frontend 2>/dev/null || true
+          docker rm erpcore-frontend 2>/dev/null || true
+
+      - name: Start frontend container
+        run: |
+          docker run -d \
+            --name erpcore-frontend \
+            -p 6702:6702 \
+            --add-host=host.docker.internal:host-gateway \
+            -e BACKEND_ORIGIN=http://host.docker.internal:6701 \
+            --restart unless-stopped \
+            --memory="512m" \
+            --cpus="1.0" \
+            --cap-drop ALL \
+            --security-opt no-new-privileges \
+            erpcore-frontend:latest
+
+      - name: Remove old frontend images
+        run: docker image prune -f
+
+      - name: Verify frontend
+        run: |
+          docker ps --filter name=erpcore-frontend --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}" \
+            | grep erpcore-frontend && echo "Frontend container running" || echo "Frontend container failed"
@@ -27,13 +27,15 @@ public sealed class AuthController : ControllerBase
    private readonly IAuthRecoveryService _recovery;
    private readonly IAuthAltService _alt;
    private readonly IRoleService _roles;
+    private readonly IAuditService _audit;

-    public AuthController(IAuthUserService users, IAuthRecoveryService recovery, IAuthAltService alt, IRoleService roles)
+    public AuthController(IAuthUserService users, IAuthRecoveryService recovery, IAuthAltService alt, IRoleService roles, IAuditService audit)
    {
        _users = users;
        _recovery = recovery;
        _alt = alt;
        _roles = roles;
+        _audit = audit;
    }

    /// <summary>
@@ -68,6 +70,7 @@ public sealed class AuthController : ControllerBase
    {
        var result = await _users.LoginAsync(request, ct);
        AuthCookieWriter.WriteSession(Response, result.AccessToken, result.RefreshToken, result.Body.ExpiresIn);
+        if (result.Body.User?.UserId is Guid authUserId) await _audit.RecordLoginAsync(authUserId, ClientIp(), ClientUserAgent(), ct);
        return Ok(result.Body);
    }

@@ -78,9 +81,13 @@ public sealed class AuthController : ControllerBase
    {
        var result = await _users.VerifyOtpForLoginAsync(request, ct);
        AuthCookieWriter.WriteSession(Response, result.AccessToken, result.RefreshToken, result.Body.ExpiresIn);
+        if (result.Body.User?.UserId is Guid authUserId) await _audit.RecordLoginAsync(authUserId, ClientIp(), ClientUserAgent(), ct);
        return Ok(result.Body);
    }

+    private string? ClientIp() => HttpContext.Connection.RemoteIpAddress?.ToString();
+    private string? ClientUserAgent() => Request.Headers.UserAgent.ToString() is { Length: > 0 } ua ? ua : null;
+
    [HttpPost("refresh-token")]
    [AllowAnonymous]
    [ProducesResponseType(typeof(AuthSessionResponse), StatusCodes.Status200OK)]
@@ -0,0 +1,44 @@
+using ERPCore.Dtos.Config;
+using ERPCore.Services.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+
+namespace ERPCore.Controllers;
+
+/// <summary>
+/// Branch configuration endpoints — the singleton toggle for whether this deployment
+/// requires a branch on Employee/Warehouse records at all.
+/// <para>
+/// <b>Authorization:</b> writes are admitted by the inherited ERP door policy only, same
+/// Phase-1 posture as <see cref="ProductConfigController"/> — any ERP-admitted user can
+/// flip this flag until per-endpoint RBAC lands.
+/// </para>
+/// </summary>
+[Route("api/v1/branch-config")]
+public sealed class BranchConfigController : ApiControllerBase
+{
+    private readonly IBranchConfigService _config;
+
+    public BranchConfigController(IBranchConfigService config) => _config = config;
+
+    [HttpGet]
+    [ProducesResponseType(typeof(BranchConfigDto), StatusCodes.Status200OK)]
+    public async Task<ActionResult<BranchConfigDto>> Get(CancellationToken ct)
+    {
+        var result = await _config.GetAsync(ct);
+        SetETag(result.RowVersion);
+        return Ok(result.Value);
+    }
+
+    [HttpPut]
+    [ProducesResponseType(typeof(BranchConfigDto), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(StatusCodes.Status412PreconditionFailed)]
+    public async Task<ActionResult<BranchConfigDto>> Update(
+        [FromBody] UpdateBranchConfigRequest request, CancellationToken ct)
+    {
+        var expected = RequireIfMatch();
+        var result = await _config.UpdateAsync(request, expected, ct);
+        SetETag(result.RowVersion);
+        return Ok(result.Value);
+    }
+}
@@ -15,6 +15,6 @@ public sealed class DashboardController : ApiControllerBase
    /// <summary>Aggregate counts for stock, GRN, and procurement.</summary>
    [HttpGet("stats")]
    [ProducesResponseType(typeof(DashboardStatsDto), StatusCodes.Status200OK)]
-    public async Task<ActionResult<DashboardStatsDto>> GetStats(CancellationToken ct)
-        => Ok(await _dashboard.GetStatsAsync(ct));
+    public async Task<ActionResult<DashboardStatsDto>> GetStats([FromQuery] int? branchId, CancellationToken ct)
+        => Ok(await _dashboard.GetStatsAsync(branchId, ct));
 }
@@ -22,8 +22,8 @@ public sealed class GrnsController : ApiControllerBase
    [ProducesResponseType(typeof(PagedResponse<GrnSummaryDto>), StatusCodes.Status200OK)]
    public async Task<ActionResult<PagedResponse<GrnSummaryDto>>> List(
        [FromQuery] PageQuery query, [FromQuery] GrnStatus? status, [FromQuery] int? poId,
-        [FromQuery] int? vendorId, [FromQuery] int? warehouseId, CancellationToken ct)
-        => Ok(await _grns.ListAsync(query, status, poId, vendorId, warehouseId, ct));
+        [FromQuery] int? vendorId, [FromQuery] int? warehouseId, [FromQuery] int? branchId, CancellationToken ct)
+        => Ok(await _grns.ListAsync(query, status, poId, vendorId, warehouseId, branchId, ct));

    [HttpGet("{grnId:int}")]
    [ProducesResponseType(typeof(GrnDto), StatusCodes.Status200OK)]
@@ -61,4 +61,14 @@ public sealed class BranchesController : ApiControllerBase
        await _branches.SetStatusAsync(branchId, request.Status, ct);
        return NoContent();
    }
+
+    [HttpDelete("{branchId:int}")]
+    [ProducesResponseType(StatusCodes.Status204NoContent)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    [ProducesResponseType(StatusCodes.Status409Conflict)]
+    public async Task<IActionResult> Delete(int branchId, CancellationToken ct)
+    {
+        await _branches.DeleteAsync(branchId, ct);
+        return NoContent();
+    }
 }
@@ -62,4 +62,14 @@ public sealed class DepartmentsController : ApiControllerBase
        await _departments.SetStatusAsync(departmentId, request.Status, ct);
        return NoContent();
    }
+
+    [HttpDelete("{departmentId:int}")]
+    [ProducesResponseType(StatusCodes.Status204NoContent)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    [ProducesResponseType(StatusCodes.Status409Conflict)]
+    public async Task<IActionResult> Delete(int departmentId, CancellationToken ct)
+    {
+        await _departments.DeleteAsync(departmentId, ct);
+        return NoContent();
+    }
 }
@@ -61,4 +61,14 @@ public sealed class DesignationsController : ApiControllerBase
        await _designations.SetStatusAsync(designationId, request.Status, ct);
        return NoContent();
    }
+
+    [HttpDelete("{designationId:int}")]
+    [ProducesResponseType(StatusCodes.Status204NoContent)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    [ProducesResponseType(StatusCodes.Status409Conflict)]
+    public async Task<IActionResult> Delete(int designationId, CancellationToken ct)
+    {
+        await _designations.DeleteAsync(designationId, ct);
+        return NoContent();
+    }
 }
@@ -83,7 +83,6 @@ public sealed class EmployeesController : ApiControllerBase
        return Ok(result.Value);
    }

-    /// <summary>Never a hard delete — Employee is retained forever (docs/12-BACKEND-HRM.md C.2).</summary>
    [HttpPatch("{employeeId:int}/status")]
    [ProducesResponseType(StatusCodes.Status204NoContent)]
    [ProducesResponseType(StatusCodes.Status404NotFound)]
@@ -93,6 +92,17 @@ public sealed class EmployeesController : ApiControllerBase
        return NoContent();
    }

+    /// <summary>Permanently deletes the employee and all dependent HR records. Blocked (409) if payroll history exists.</summary>
+    [HttpDelete("{employeeId:int}")]
+    [ProducesResponseType(StatusCodes.Status204NoContent)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    [ProducesResponseType(StatusCodes.Status409Conflict)]
+    public async Task<IActionResult> Delete(int employeeId, CancellationToken ct)
+    {
+        await _employees.DeleteAsync(employeeId, ct);
+        return NoContent();
+    }
+
    [HttpPost("{employeeId:int}/link-user")]
    [ProducesResponseType(StatusCodes.Status204NoContent)]
    [ProducesResponseType(StatusCodes.Status404NotFound)]
@@ -61,4 +61,14 @@ public sealed class EmploymentTypesController : ApiControllerBase
        await _employmentTypes.SetStatusAsync(employmentTypeId, request.Status, ct);
        return NoContent();
    }
+
+    [HttpDelete("{employmentTypeId:int}")]
+    [ProducesResponseType(StatusCodes.Status204NoContent)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    [ProducesResponseType(StatusCodes.Status409Conflict)]
+    public async Task<IActionResult> Delete(int employmentTypeId, CancellationToken ct)
+    {
+        await _employmentTypes.DeleteAsync(employmentTypeId, ct);
+        return NoContent();
+    }
 }
@@ -61,4 +61,14 @@ public sealed class HrDocumentTypesController : ApiControllerBase
        await _types.SetStatusAsync(hrDocumentTypeId, request.Status, ct);
        return NoContent();
    }
+
+    [HttpDelete("{hrDocumentTypeId:int}")]
+    [ProducesResponseType(StatusCodes.Status204NoContent)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    [ProducesResponseType(StatusCodes.Status409Conflict)]
+    public async Task<IActionResult> Delete(int hrDocumentTypeId, CancellationToken ct)
+    {
+        await _types.DeleteAsync(hrDocumentTypeId, ct);
+        return NoContent();
+    }
 }
@@ -61,4 +61,14 @@ public sealed class LeaveTypesController : ApiControllerBase
        await _leaveTypes.SetStatusAsync(leaveTypeId, request.Status, ct);
        return NoContent();
    }
+
+    [HttpDelete("{leaveTypeId:int}")]
+    [ProducesResponseType(StatusCodes.Status204NoContent)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    [ProducesResponseType(StatusCodes.Status409Conflict)]
+    public async Task<IActionResult> Delete(int leaveTypeId, CancellationToken ct)
+    {
+        await _leaveTypes.DeleteAsync(leaveTypeId, ct);
+        return NoContent();
+    }
 }
@@ -61,4 +61,14 @@ public sealed class SalaryComponentsController : ApiControllerBase
        await _components.SetStatusAsync(salaryComponentId, request.Status, ct);
        return NoContent();
    }
+
+    [HttpDelete("{salaryComponentId:int}")]
+    [ProducesResponseType(StatusCodes.Status204NoContent)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    [ProducesResponseType(StatusCodes.Status409Conflict)]
+    public async Task<IActionResult> Delete(int salaryComponentId, CancellationToken ct)
+    {
+        await _components.DeleteAsync(salaryComponentId, ct);
+        return NoContent();
+    }
 }
@@ -61,4 +61,14 @@ public sealed class WorkShiftsController : ApiControllerBase
        await _shifts.SetStatusAsync(workShiftId, request.Status, ct);
        return NoContent();
    }
+
+    [HttpDelete("{workShiftId:int}")]
+    [ProducesResponseType(StatusCodes.Status204NoContent)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    [ProducesResponseType(StatusCodes.Status409Conflict)]
+    public async Task<IActionResult> Delete(int workShiftId, CancellationToken ct)
+    {
+        await _shifts.DeleteAsync(workShiftId, ct);
+        return NoContent();
+    }
 }
@@ -25,8 +25,9 @@ public sealed class SalesInvoicesController : ApiControllerBase
        [FromQuery] SalesInvoiceStatus? status,
        [FromQuery] int? customerId,
        [FromQuery] int? warehouseId,
+        [FromQuery] int? branchId,
        CancellationToken ct)
-        => Ok(await _invoices.ListAsync(query, status, customerId, warehouseId, ct));
+        => Ok(await _invoices.ListAsync(query, status, customerId, warehouseId, branchId, ct));

    [HttpGet("{salesInvoiceId:int}")]
    [ProducesResponseType(typeof(SalesInvoiceDto), StatusCodes.Status200OK)]
@@ -17,8 +17,8 @@ public sealed class StockAdjustmentsController : ApiControllerBase
    [HttpGet]
    [ProducesResponseType(typeof(PagedResponse<AdjustmentSummaryDto>), StatusCodes.Status200OK)]
    public async Task<ActionResult<PagedResponse<AdjustmentSummaryDto>>> List(
-        [FromQuery] PageQuery query, [FromQuery] int? warehouseId, [FromQuery] int? reasonCodeId, CancellationToken ct)
-        => Ok(await _adjustments.ListAsync(query, warehouseId, reasonCodeId, ct));
+        [FromQuery] PageQuery query, [FromQuery] int? warehouseId, [FromQuery] int? branchId, [FromQuery] int? reasonCodeId, CancellationToken ct)
+        => Ok(await _adjustments.ListAsync(query, warehouseId, branchId, reasonCodeId, ct));

    /// <summary>Get one adjustment with its lines and the ledger entries it posted.</summary>
    [HttpGet("{adjustmentId:int}")]
@@ -28,8 +28,8 @@ public sealed class StockController : ApiControllerBase
    [HttpGet("on-hand/list")]
    [ProducesResponseType(typeof(PagedResponse<StockOnHandDto>), StatusCodes.Status200OK)]
    public async Task<ActionResult<PagedResponse<StockOnHandDto>>> OnHandList(
-        [FromQuery] int? itemId, [FromQuery] int? warehouseId, [FromQuery] PageQuery query, CancellationToken ct)
-        => Ok(await _stock.GetOnHandListAsync(itemId, warehouseId, query, ct));
+        [FromQuery] int? itemId, [FromQuery] int? warehouseId, [FromQuery] int? branchId, [FromQuery] PageQuery query, CancellationToken ct)
+        => Ok(await _stock.GetOnHandListAsync(itemId, warehouseId, branchId, query, ct));

    /// <summary>
    /// Immutable movement history. <c>sourceDocType</c>/<c>sourceDocId</c> answer "what did
@@ -39,11 +39,11 @@ public sealed class StockController : ApiControllerBase
    [HttpGet("ledger")]
    [ProducesResponseType(typeof(PagedResponse<StockLedgerRowDto>), StatusCodes.Status200OK)]
    public async Task<ActionResult<PagedResponse<StockLedgerRowDto>>> Ledger(
-        [FromQuery] int? itemId, [FromQuery] int? warehouseId,
+        [FromQuery] int? itemId, [FromQuery] int? warehouseId, [FromQuery] int? branchId,
        [FromQuery] DateOnly? from, [FromQuery] DateOnly? to,
        [FromQuery] string? sourceDocType, [FromQuery] int? sourceDocId,
        [FromQuery] PageQuery query, CancellationToken ct)
-        => Ok(await _stock.GetLedgerAsync(itemId, warehouseId, from, to, sourceDocType, sourceDocId, query, ct));
+        => Ok(await _stock.GetLedgerAsync(itemId, warehouseId, branchId, from, to, sourceDocType, sourceDocId, query, ct));

    [HttpGet("valuation")]
    [ProducesResponseType(typeof(StockValuationDto), StatusCodes.Status200OK)]
@@ -54,8 +54,8 @@ public sealed class StockController : ApiControllerBase
    [HttpGet("reorder-alerts")]
    [ProducesResponseType(typeof(PagedResponse<ReorderAlertDto>), StatusCodes.Status200OK)]
    public async Task<ActionResult<PagedResponse<ReorderAlertDto>>> ReorderAlerts(
-        [FromQuery] int? warehouseId, [FromQuery] PageQuery query, CancellationToken ct)
-        => Ok(await _reorder.GetAlertsAsync(warehouseId, query, ct));
+        [FromQuery] int? warehouseId, [FromQuery] int? branchId, [FromQuery] PageQuery query, CancellationToken ct)
+        => Ok(await _reorder.GetAlertsAsync(warehouseId, branchId, query, ct));

    /// <summary>Create a draft requisition for an item's suggested reorder quantity.</summary>
    [HttpPost("reorder-alerts/{itemId:int}/requisition")]
@@ -18,8 +18,8 @@ public sealed class StockCountsController : ApiControllerBase
    [HttpGet]
    [ProducesResponseType(typeof(PagedResponse<CountSummaryDto>), StatusCodes.Status200OK)]
    public async Task<ActionResult<PagedResponse<CountSummaryDto>>> List(
-        [FromQuery] PageQuery query, [FromQuery] CountStatus? status, [FromQuery] int? warehouseId, CancellationToken ct)
-        => Ok(await _counts.ListAsync(query, status, warehouseId, ct));
+        [FromQuery] PageQuery query, [FromQuery] CountStatus? status, [FromQuery] int? warehouseId, [FromQuery] int? branchId, CancellationToken ct)
+        => Ok(await _counts.ListAsync(query, status, warehouseId, branchId, ct));

    [HttpGet("{countId:int}")]
    [ProducesResponseType(typeof(CountDto), StatusCodes.Status200OK)]
@@ -19,8 +19,8 @@ public sealed class StockTransfersController : ApiControllerBase
    [ProducesResponseType(typeof(PagedResponse<TransferSummaryDto>), StatusCodes.Status200OK)]
    public async Task<ActionResult<PagedResponse<TransferSummaryDto>>> List(
        [FromQuery] PageQuery query, [FromQuery] TransferStatus? status,
-        [FromQuery] int? srcWarehouseId, [FromQuery] int? destWarehouseId, CancellationToken ct)
-        => Ok(await _transfers.ListAsync(query, status, srcWarehouseId, destWarehouseId, ct));
+        [FromQuery] int? srcWarehouseId, [FromQuery] int? destWarehouseId, [FromQuery] int? branchId, CancellationToken ct)
+        => Ok(await _transfers.ListAsync(query, status, srcWarehouseId, destWarehouseId, branchId, ct));

    [HttpGet("{transferId:int}")]
    [ProducesResponseType(typeof(TransferDto), StatusCodes.Status200OK)]
@@ -1,6 +1,9 @@
+using ERPCore.Domain.Enums;
+using ERPCore.Dtos.Audit;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Hrm;
 using ERPCore.Dtos.Users;
+using ERPCore.Infra.Auth;
 using ERPCore.Services.Interfaces;
 using Microsoft.AspNetCore.Mvc;

@@ -15,11 +18,15 @@ public sealed class UsersController : ApiControllerBase
 {
    private readonly IUserManagementService _users;
    private readonly IEmployeeUserLinkService _links;
+    private readonly IAuditService _audit;
+    private readonly ICurrentUser _currentUser;

-    public UsersController(IUserManagementService users, IEmployeeUserLinkService links)
+    public UsersController(IUserManagementService users, IEmployeeUserLinkService links, IAuditService audit, ICurrentUser currentUser)
    {
        _users = users;
        _links = links;
+        _audit = audit;
+        _currentUser = currentUser;
    }

    /// <summary>Advisory forward-direction lookup: does a Staff record already exist with this email? (docs/12-BACKEND-HRM.md A.5)</summary>
@@ -30,8 +37,8 @@ public sealed class UsersController : ApiControllerBase

    [HttpGet]
    [ProducesResponseType(typeof(PagedResponse<ManagedUserDto>), StatusCodes.Status200OK)]
-    public async Task<ActionResult<PagedResponse<ManagedUserDto>>> List([FromQuery] PageQuery query, CancellationToken ct)
-        => Ok(await _users.ListAsync(query, ct));
+    public async Task<ActionResult<PagedResponse<ManagedUserDto>>> List([FromQuery] PageQuery query, [FromQuery] EntityStatus? status, [FromQuery] string? roleCode, CancellationToken ct)
+        => Ok(await _users.ListAsync(query, status, roleCode, ct));

    /// <summary>AuthHex UserType options for the create-user form's select.</summary>
    [HttpGet("user-types")]
@@ -53,7 +60,7 @@ public sealed class UsersController : ApiControllerBase
    [ProducesResponseType(StatusCodes.Status409Conflict)]
    public async Task<ActionResult<ManagedUserDto>> Create([FromBody] CreateUserRequest request, CancellationToken ct)
    {
-        var result = await _users.CreateAsync(request, ct);
+        var result = await _users.CreateAsync(request, _currentUser.AuditUserId, ct);
        return Created($"/api/v1/users/{result.UserId}", result);
    }

@@ -62,4 +69,18 @@ public sealed class UsersController : ApiControllerBase
    [ProducesResponseType(StatusCodes.Status404NotFound)]
    public async Task<ActionResult<ManagedUserDto>> UpdateRole(int userId, [FromBody] UpdateUserRoleRequest request, CancellationToken ct)
        => Ok(await _users.UpdateRoleAsync(userId, request, ct));
+
+    /// <summary>Revokes/restores standing inside ERPCore only — see <see cref="IUserManagementService.SetStatusAsync"/>.</summary>
+    [HttpPatch("{userId:int}/status")]
+    [ProducesResponseType(typeof(ManagedUserDto), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public async Task<ActionResult<ManagedUserDto>> UpdateStatus(int userId, [FromBody] UpdateUserStatusRequest request, CancellationToken ct)
+        => Ok(await _users.SetStatusAsync(userId, request.Status, ct));
+
+    /// <summary>Device/login history ERPCore captures itself — not AuthHex's "currently active sessions"
+    /// (which only ever reports the caller's own). See <see cref="IAuditService.ListLoginDevicesAsync"/>.</summary>
+    [HttpGet("{userId:int}/login-devices")]
+    [ProducesResponseType(typeof(PagedResponse<LoginActivityDto>), StatusCodes.Status200OK)]
+    public async Task<ActionResult<PagedResponse<LoginActivityDto>>> ListLoginDevices(int userId, [FromQuery] PageQuery query, CancellationToken ct)
+        => Ok(await _audit.ListLoginDevicesAsync(userId, query, ct));
 }
@@ -15,8 +15,9 @@ public sealed class WarehousesController : ApiControllerBase

    [HttpGet]
    [ProducesResponseType(typeof(PagedResponse<WarehouseDto>), StatusCodes.Status200OK)]
-    public async Task<ActionResult<PagedResponse<WarehouseDto>>> List([FromQuery] PageQuery query, CancellationToken ct)
-        => Ok(await _warehouses.ListAsync(query, ct));
+    public async Task<ActionResult<PagedResponse<WarehouseDto>>> List(
+        [FromQuery] PageQuery query, [FromQuery] int? branchId, CancellationToken ct)
+        => Ok(await _warehouses.ListAsync(query, branchId, ct));

    [HttpGet("{warehouseId:int}")]
    [ProducesResponseType(typeof(WarehouseDto), StatusCodes.Status200OK)]
@@ -3,16 +3,19 @@ using ERPCore.Domain.Enums;
 namespace ERPCore.Domain.Entities;

 /// <summary>
-/// Branch/location master (FR-HR-MD-01) — multi-branch readiness. Referenced
-/// optionally by <see cref="Employee.BranchId"/> and <see cref="PayrollRun.BranchId"/>.
+/// Branch/location master (FR-HR-MD-01) — multi-branch readiness. Required by
+/// <see cref="Employee.BranchId"/>, optionally referenced by <see cref="PayrollRun.BranchId"/>.
 /// Deactivated, not deleted, when referenced. Model: docs/12-BACKEND-HRM.md Part C.1.
 /// </summary>
 public class Branch
 {
    public int BranchId { get; set; }
+
+    /// <summary>Server-generated on create ("BR-001", "BR-002", ...) — never accepted from the client.</summary>
    public string Code { get; set; } = string.Empty;
    public string Name { get; set; } = string.Empty;
    public string? Address { get; set; }
+    public string? PhoneNumber { get; set; }
    public EntityStatus Status { get; set; } = EntityStatus.Active;

    public DateTime CreatedAt { get; set; }
@@ -0,0 +1,27 @@
+namespace ERPCore.Domain.Entities;
+
+/// <summary>
+/// Branch configuration — a singleton row (single-tenant, docs/00-CORE §1) gating whether
+/// this deployment uses branches at all. When <see cref="BranchingEnabled"/> is off, the
+/// Employee/Warehouse create forms stop asking for a branch and every new record is
+/// silently assigned to the deployment's one default branch instead — schema-wise
+/// <c>Employee.BranchId</c>/<c>Warehouse.BranchId</c> stay <c>NOT NULL</c> either way, only
+/// the UI/UX requirement toggles. See <see cref="Services.BranchConfigService.ResolveBranchIdAsync"/>.
+/// </summary>
+public class BranchConfig
+{
+    /// <summary>Always 1 - the singleton row's id.</summary>
+    public const int SingletonId = 1;
+
+    public int ConfigId { get; set; }
+
+    public bool BranchingEnabled { get; set; } = true;
+
+    public DateTime? UpdatedAt { get; set; }
+
+    public int? UpdatedBy { get; set; }
+    public User? UpdatedByUser { get; set; }
+
+    /// <summary>PostgreSQL xmin-backed optimistic concurrency token (ETag source).</summary>
+    public uint RowVersion { get; set; }
+}
@@ -6,8 +6,10 @@ namespace ERPCore.Domain.Entities;
 /// Staff record (FR-HR-MD-02) — distinct from <see cref="User"/> (the system login
 /// account): not every employee has a login, and not every login belongs to an
 /// employee. <see cref="UserId"/> is the optional, explicit, human-confirmed link
-/// between the two (docs/12-BACKEND-HRM.md A.5/C.2, Part B.3.2). Never hard-deleted —
-/// separation is recorded via <see cref="Status"/> + <see cref="LastWorkingDate"/>.
+/// between the two (docs/12-BACKEND-HRM.md A.5/C.2, Part B.3.2). Normal separation is
+/// recorded via <see cref="Status"/> + <see cref="LastWorkingDate"/> rather than deletion;
+/// an explicit hard delete is also available (<see cref="Services.Interfaces.IEmployeeService.DeleteAsync"/>)
+/// and cascades to every dependent HR record, blocked only if payroll history exists.
 /// <see cref="EmployeeCode"/> is user-entered (not <see cref="NumberSequence"/>-issued):
 /// HR departments keep their own legacy numbering scheme, and NumberSequence's
 /// year-scoping is the wrong shape for an identifier that must never look "reset".
@@ -50,7 +52,7 @@ public class Employee
    public Designation? Designation { get; set; }
    public int EmploymentTypeId { get; set; }
    public EmploymentType? EmploymentType { get; set; }
-    public int? BranchId { get; set; }
+    public int BranchId { get; set; }
    public Branch? Branch { get; set; }
    public int WorkShiftId { get; set; }
    public WorkShift? WorkShift { get; set; }
@@ -22,6 +22,11 @@ public class Grn
    public int WarehouseId { get; set; }
    public Warehouse? Warehouse { get; set; }

+    /// <summary>Owning branch, set explicitly at creation — warehouses are shared across
+    /// branches, so branch scope can no longer be derived from <see cref="Warehouse"/>.</summary>
+    public int BranchId { get; set; }
+    public Branch? Branch { get; set; }
+
    public GrnStatus Status { get; set; } = GrnStatus.Draft;

    public int CreatedBy { get; set; }
@@ -0,0 +1,22 @@
+namespace ERPCore.Domain.Entities;
+
+/// <summary>
+/// One row per successful sign-in, captured directly by ERPCore (not AuthHex) so an
+/// admin can see a user's device/login history — AuthHex's own session listing only
+/// ever reports the currently-authenticated caller's own sessions, with no admin-scoped
+/// call to inspect anyone else's. This is a history of past logins, not a live "currently
+/// active sessions" view (that would need AuthHex to expose one).
+/// </summary>
+public class LoginActivity
+{
+    public int LoginActivityId { get; set; }
+    public int UserId { get; set; }
+    public User? User { get; set; }
+
+    public string? IpAddress { get; set; }
+    public string? UserAgent { get; set; }
+    /// <summary>Best-effort "Browser on OS" label parsed from <see cref="UserAgent"/> for display.</summary>
+    public string? DeviceLabel { get; set; }
+
+    public DateTime LoginAt { get; set; }
+}
@@ -17,6 +17,11 @@ public class SalesInvoice
    public int WarehouseId { get; set; }
    public Warehouse? Warehouse { get; set; }

+    /// <summary>Owning branch, set explicitly at creation — warehouses are shared across
+    /// branches, so branch scope can no longer be derived from <see cref="Warehouse"/>.</summary>
+    public int BranchId { get; set; }
+    public Branch? Branch { get; set; }
+
    public SalesInvoiceType InvoiceType { get; set; } = SalesInvoiceType.B2C;
    public SalesInvoiceStatus Status { get; set; } = SalesInvoiceStatus.Draft;

@@ -19,6 +19,11 @@ public class StockAdjustment
    public int ReasonCodeId { get; set; }
    public ReasonCode? ReasonCode { get; set; }

+    /// <summary>Owning branch, set explicitly at creation — warehouses are shared across
+    /// branches, so branch scope can no longer be derived from <see cref="Warehouse"/>.</summary>
+    public int BranchId { get; set; }
+    public Branch? Branch { get; set; }
+
    public AdjustmentStatus Status { get; set; } = AdjustmentStatus.Posted;

    public int CreatedBy { get; set; }
@@ -16,6 +16,11 @@ public class StockCount
    public int WarehouseId { get; set; }
    public Warehouse? Warehouse { get; set; }

+    /// <summary>Owning branch, set explicitly at creation — warehouses are shared across
+    /// branches, so branch scope can no longer be derived from <see cref="Warehouse"/>.</summary>
+    public int BranchId { get; set; }
+    public Branch? Branch { get; set; }
+
    public CountType CountType { get; set; }
    public CountStatus Status { get; set; } = CountStatus.Draft;

@@ -19,6 +19,11 @@ public class StockTransfer
    public int DestWarehouseId { get; set; }
    public Warehouse? DestWarehouse { get; set; }

+    /// <summary>Owning branch, set explicitly at creation — warehouses are shared across
+    /// branches, so branch scope can no longer be derived from src/dest warehouse.</summary>
+    public int BranchId { get; set; }
+    public Branch? Branch { get; set; }
+
    public TransferStatus Status { get; set; } = TransferStatus.Draft;

    public int CreatedBy { get; set; }
@@ -9,6 +9,8 @@ public class Warehouse
    public int WarehouseId { get; set; }
    public string Code { get; set; } = string.Empty;
    public string Name { get; set; } = string.Empty;
+    public int BranchId { get; set; }
+    public Branch? Branch { get; set; }

    public ICollection<Bin> Bins { get; set; } = new List<Bin>();
 }
@@ -5,5 +5,8 @@ public enum AuditAction
 {
    Create,
    Update,
-    Delete
+    Delete,
+    /// <summary>A successful sign-in — written explicitly (not via ErpDbContext's automatic
+    /// entity-change capture, since a login mutates nothing) by AuthController.</summary>
+    Login
 }
@@ -10,3 +10,7 @@ public sealed record AuditLogDto(
 /// <summary>A GL-ready journal stub emitted per stock movement (FR-STK-13).</summary>
 public sealed record JournalEntryStubDto(
    int JournalId, string SourceDocType, int SourceDocId, string DebitAccount, string CreditAccount, decimal Amount);
+
+/// <summary>A captured past sign-in — device history, not a live "currently active sessions" view.</summary>
+public sealed record LoginActivityDto(
+    int LoginActivityId, string? IpAddress, string? DeviceLabel, DateTime LoginAt);
@@ -0,0 +1,20 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace ERPCore.Dtos.Config;
+
+/// <summary>Branch configuration resource — the singleton toggle for whether this deployment
+/// requires a branch on Employee/Warehouse records at all.</summary>
+public sealed record BranchConfigDto(bool BranchingEnabled, DateTime? UpdatedAt, int? UpdatedBy);
+
+/// <summary>
+/// Full replacement of the flag. <c>UpdatedBy</c> is derived from the token, never posted.
+/// <para>
+/// <see cref="BranchingEnabled"/> is <see cref="bool"/>? deliberately: <c>[Required]</c> on a
+/// non-nullable bool is a no-op, so an omitted flag would otherwise silently bind to
+/// <c>false</c>. Nullable makes the requirement actually bind — an omitted flag is a 400.
+/// </para>
+/// </summary>
+public sealed class UpdateBranchConfigRequest
+{
+    [Required] public bool? BranchingEnabled { get; set; }
+}
@@ -15,13 +15,13 @@ public sealed record GrnLineDto(
    HoldStatus HoldStatus, int? BatchId, IReadOnlyList<GrnLineWarrantyNumberDto> WarrantyNumbers);

 public sealed record GrnDto(
-    int GrnId, string DocNo, int? PoId, int VendorId, int WarehouseId, GrnStatus Status,
+    int GrnId, string DocNo, int? PoId, int VendorId, int WarehouseId, int BranchId, GrnStatus Status,
    int CreatedBy, DateTime CreatedAt, DateTime? PostedAt, string? GlJournalNo,
    int? PurchaseInvoiceId, string? PurchaseInvoiceNo, IReadOnlyList<GrnLineDto> Lines);

 /// <summary>Row shape for <c>GET /grns</c> — line count instead of the lines themselves.</summary>
 public sealed record GrnSummaryDto(
-    int GrnId, string DocNo, int? PoId, int VendorId, int WarehouseId, GrnStatus Status,
+    int GrnId, string DocNo, int? PoId, int VendorId, int WarehouseId, int BranchId, GrnStatus Status,
    int CreatedBy, DateTime CreatedAt, DateTime? PostedAt, int LineCount,
    int? PurchaseInvoiceId, string? PurchaseInvoiceNo);

@@ -81,6 +81,9 @@ public sealed class CreateGrnRequest
    /// <summary>Required for a direct receipt (no PO); ignored otherwise (vendor derives from the PO).</summary>
    public int? VendorId { get; set; }
    [Required] public int WarehouseId { get; set; }
+    /// <summary>Owning branch for this GRN — warehouses are shared, so this is what actually
+    /// scopes the document (resolved via IBranchConfigService; required when branching is enabled).</summary>
+    [Required] public int BranchId { get; set; }
    [Required, MinLength(1)] public List<CreateGrnLineInput> Lines { get; set; } = new();
 }

@@ -6,7 +6,7 @@ namespace ERPCore.Dtos.Hrm;
 public sealed record EmployeeListItemDto(
    int EmployeeId, string EmployeeCode, string FullName, string? Email,
    int DepartmentId, string? DepartmentName, int DesignationId, string? DesignationName,
-    int EmploymentTypeId, string? EmploymentTypeName, int? BranchId, string? BranchName,
+    int EmploymentTypeId, string? EmploymentTypeName, int BranchId, string? BranchName,
    EmployeeStatus Status, bool HasUserLink, DateTime HireDate);

 public sealed record EmployeeDetailDto(
@@ -16,7 +16,7 @@ public sealed record EmployeeDetailDto(
    string? City, string? PostalCode, string? Country,
    string? EmergencyContactName, string? EmergencyContactRelationship, string? EmergencyContactPhone,
    DateTime HireDate, DateTime? ConfirmationDate, DateTime? LastWorkingDate,
-    int DepartmentId, int DesignationId, int EmploymentTypeId, int? BranchId, int WorkShiftId,
+    int DepartmentId, int DesignationId, int EmploymentTypeId, int BranchId, int WorkShiftId,
    int? ReportingManagerId, string? EpfNumber, string? EtfNumber, string? TaxIdentificationNumber,
    int? UserId, EmployeeStatus Status, DateTime CreatedAt, DateTime? UpdatedAt);

@@ -45,7 +45,7 @@ public sealed class CreateEmployeeRequest
    [Required] public int DepartmentId { get; set; }
    [Required] public int DesignationId { get; set; }
    [Required] public int EmploymentTypeId { get; set; }
-    public int? BranchId { get; set; }
+    [Required] public int BranchId { get; set; }
    [Required] public int WorkShiftId { get; set; }
    public int? ReportingManagerId { get; set; }

@@ -82,7 +82,7 @@ public sealed class UpdateEmployeeRequest
    [Required] public int DepartmentId { get; set; }
    [Required] public int DesignationId { get; set; }
    [Required] public int EmploymentTypeId { get; set; }
-    public int? BranchId { get; set; }
+    [Required] public int BranchId { get; set; }
    [Required] public int WorkShiftId { get; set; }
    public int? ReportingManagerId { get; set; }

@@ -7,20 +7,22 @@ namespace ERPCore.Dtos.Hrm;
 // ids, timestamps) excluded from create/update requests (02-SECURITY B.6/C.1).

 public sealed record BranchDto(
-    int BranchId, string Code, string Name, string? Address, EntityStatus Status,
+    int BranchId, string Code, string Name, string? Address, string? PhoneNumber, EntityStatus Status,
    DateTime CreatedAt, DateTime? UpdatedAt);

+// Code is server-generated (BranchService.GenerateCodeAsync) — never accepted from the client.
 public sealed class CreateBranchRequest
 {
-    [Required, StringLength(20)] public string Code { get; set; } = string.Empty;
    [Required, StringLength(200)] public string Name { get; set; } = string.Empty;
    [StringLength(500)] public string? Address { get; set; }
+    [StringLength(30)] public string? PhoneNumber { get; set; }
 }

 public sealed class UpdateBranchRequest
 {
    [Required, StringLength(200)] public string Name { get; set; } = string.Empty;
    [StringLength(500)] public string? Address { get; set; }
+    [StringLength(30)] public string? PhoneNumber { get; set; }
 }

 public sealed record DepartmentDto(
@@ -2,5 +2,13 @@ namespace ERPCore.Dtos.Rbac;

 /// <summary>Response for `GET /api/v1/auth/me` — the frontend's authoritative source
 /// for the current user's role and permitted sidebar nav codes (replaces trusting
-/// the stale, client-only `roleId` cached in localStorage).</summary>
-public sealed record MeResponseDto(string? RoleCode, string? RoleName, IReadOnlyList<string> NavCodes);
+/// the stale, client-only `roleId` cached in localStorage). <see cref="BranchId"/>/
+/// <see cref="BranchName"/> come from the caller's linked <c>Employee</c> record, when
+/// one exists — null for a login with no Employee link. <see cref="IsAdmin"/> gates
+/// branch pickers client-side only (no server-side branch enforcement exists yet,
+/// see docs/BRANCH_ISOLATION_PLAN.md). <see cref="BranchingEnabled"/> mirrors the
+/// singleton <c>BranchConfig</c> toggle — when false the frontend hides branch pickers
+/// entirely rather than merely restricting them by role.</summary>
+public sealed record MeResponseDto(
+    string? RoleCode, string? RoleName, IReadOnlyList<string> NavCodes,
+    bool IsAdmin, int? BranchId, string? BranchName, bool BranchingEnabled);
@@ -15,14 +15,14 @@ public sealed record SalesInvoiceTotalsDto(

 public sealed record SalesInvoiceDto(
    int SalesInvoiceId, string InvoiceNo, DateTime InvoiceDate, int CustomerId,
-    string CustomerSnapshotName, string? CustomerSnapshotTaxNo, int WarehouseId,
+    string CustomerSnapshotName, string? CustomerSnapshotTaxNo, int WarehouseId, int BranchId,
    SalesInvoiceType InvoiceType, SalesInvoiceStatus Status, int CreatedBy, DateTime CreatedAt,
    DateTime? UpdatedAt, string? GlJournalNo, DateTime? GlPostedAt,
    SalesInvoiceTotalsDto Totals, IReadOnlyList<SalesInvoiceLineDto> Lines);

 public sealed record SalesInvoiceSummaryDto(
    int SalesInvoiceId, string InvoiceNo, DateTime InvoiceDate, int CustomerId,
-    string CustomerSnapshotName, int WarehouseId, SalesInvoiceType InvoiceType,
+    string CustomerSnapshotName, int WarehouseId, int BranchId, SalesInvoiceType InvoiceType,
    SalesInvoiceStatus Status, SalesInvoiceTotalsDto Totals, DateTime CreatedAt, string? GlJournalNo);

 public sealed record SalesInvoicePaymentDto(
@@ -65,6 +65,9 @@ public sealed class CreateSalesInvoiceRequest
 {
    [Required] public int CustomerId { get; set; }
    [Required] public int WarehouseId { get; set; }
+    /// <summary>Owning branch — warehouses are shared, so this is what actually scopes the
+    /// document (resolved via IBranchConfigService).</summary>
+    [Required] public int BranchId { get; set; }
    [Required, EnumDataType(typeof(SalesInvoiceType))] public SalesInvoiceType InvoiceType { get; set; } = SalesInvoiceType.B2C;
    [Required, MinLength(1)] public List<CreateSalesInvoiceLineRequest> Lines { get; set; } = new();
 }
@@ -73,6 +76,9 @@ public sealed class UpdateSalesInvoiceRequest
 {
    [Required] public int CustomerId { get; set; }
    [Required] public int WarehouseId { get; set; }
+    /// <summary>Owning branch — warehouses are shared, so this is what actually scopes the
+    /// document (resolved via IBranchConfigService).</summary>
+    [Required] public int BranchId { get; set; }
    [Required, EnumDataType(typeof(SalesInvoiceType))] public SalesInvoiceType InvoiceType { get; set; } = SalesInvoiceType.B2C;
    [Required, MinLength(1)] public List<CreateSalesInvoiceLineRequest> Lines { get; set; } = new();
 }
@@ -8,13 +8,13 @@ namespace ERPCore.Dtos.Stock;
 public sealed record AdjustmentLineDto(int AdjLineId, int ItemId, int? BinId, int? BatchId, decimal QtyDelta);

 public sealed record AdjustmentDto(
-    int AdjustmentId, string DocNo, int WarehouseId, int ReasonCodeId, AdjustmentStatus Status,
+    int AdjustmentId, string DocNo, int WarehouseId, int BranchId, int ReasonCodeId, AdjustmentStatus Status,
    int CreatedBy, DateTime CreatedAt, string? GlJournalNo, DateTime? GlPostedAt,
    IReadOnlyList<AdjustmentLineDto> Lines, IReadOnlyList<int> LedgerRefs);

 /// <summary>Row shape for <c>GET /stock-adjustments</c> — no lines/ledgerRefs (those need a per-row query).</summary>
 public sealed record AdjustmentSummaryDto(
-    int AdjustmentId, string DocNo, int WarehouseId, int ReasonCodeId, AdjustmentStatus Status,
+    int AdjustmentId, string DocNo, int WarehouseId, int BranchId, int ReasonCodeId, AdjustmentStatus Status,
    int CreatedBy, DateTime CreatedAt, int LineCount, string? GlJournalNo);

 // Requests ----------------------------------------------------------------------
@@ -31,6 +31,9 @@ public sealed class CreateAdjustmentLineInput
 public sealed class CreateAdjustmentRequest
 {
    [Required] public int WarehouseId { get; set; }
+    /// <summary>Owning branch — warehouses are shared, so this is what actually scopes the
+    /// document (resolved via IBranchConfigService).</summary>
+    [Required] public int BranchId { get; set; }
    /// <summary>Nullable so an omitted value is a distinct <c>REASON_CODE_REQUIRED</c> error, not 0.</summary>
    public int? ReasonCodeId { get; set; }
    [Required, MinLength(1)] public List<CreateAdjustmentLineInput> Lines { get; set; } = new();
@@ -8,12 +8,12 @@ namespace ERPCore.Dtos.Stock;
 public sealed record CountLineDto(int CountLineId, int ItemId, int? BinId, decimal SystemQty, decimal? CountedQty, decimal? Variance);

 public sealed record CountDto(
-    int CountId, string DocNo, int WarehouseId, CountType CountType, CountStatus Status,
+    int CountId, string DocNo, int WarehouseId, int BranchId, CountType CountType, CountStatus Status,
    int CreatedBy, DateTime CreatedAt, IReadOnlyList<CountLineDto> Lines);

 /// <summary>Row shape for <c>GET /stock-counts</c> — line count instead of the lines themselves.</summary>
 public sealed record CountSummaryDto(
-    int CountId, string DocNo, int WarehouseId, CountType CountType, CountStatus Status,
+    int CountId, string DocNo, int WarehouseId, int BranchId, CountType CountType, CountStatus Status,
    int CreatedBy, DateTime CreatedAt, int LineCount);

 public sealed record CountPostResultDto(int CountId, CountStatus Status, int? AdjustmentId, string? GlJournalNo, IReadOnlyList<int> LedgerRefs);
@@ -23,6 +23,9 @@ public sealed record CountPostResultDto(int CountId, CountStatus Status, int? Ad
 public sealed class CreateCountRequest
 {
    [Required] public int WarehouseId { get; set; }
+    /// <summary>Owning branch — warehouses are shared, so this is what actually scopes the
+    /// document (resolved via IBranchConfigService).</summary>
+    [Required] public int BranchId { get; set; }
    [Required, EnumDataType(typeof(CountType))] public CountType CountType { get; set; }
    [Required, MinLength(1)] public List<int> ItemIds { get; set; } = new();
 }
@@ -9,12 +9,12 @@ public sealed record TransferLineDto(
    int TransferLineId, int ItemId, int? SrcBinId, int? DestBinId, int? BatchId, decimal Qty, decimal QtyReceived);

 public sealed record TransferDto(
-    int TransferId, string DocNo, int SrcWarehouseId, int DestWarehouseId,
+    int TransferId, string DocNo, int SrcWarehouseId, int DestWarehouseId, int BranchId,
    TransferStatus Status, int CreatedBy, DateTime CreatedAt, IReadOnlyList<TransferLineDto> Lines);

 /// <summary>Row shape for <c>GET /stock-transfers</c> — line count instead of the lines themselves.</summary>
 public sealed record TransferSummaryDto(
-    int TransferId, string DocNo, int SrcWarehouseId, int DestWarehouseId,
+    int TransferId, string DocNo, int SrcWarehouseId, int DestWarehouseId, int BranchId,
    TransferStatus Status, int CreatedBy, DateTime CreatedAt, int LineCount);

 public sealed record ConsumedLayerDto(int LayerId, decimal QtyConsumed, decimal UnitCost);
@@ -42,6 +42,9 @@ public sealed class CreateTransferRequest
 {
    [Required] public int SrcWarehouseId { get; set; }
    [Required] public int DestWarehouseId { get; set; }
+    /// <summary>Owning branch for this transfer — warehouses are shared, so this is what
+    /// actually scopes the document (resolved via IBranchConfigService).</summary>
+    [Required] public int BranchId { get; set; }
    [Required, MinLength(1)] public List<CreateTransferLineInput> Lines { get; set; } = new();
 }

@@ -30,6 +30,22 @@ public sealed class CreateUserRequest
    /// email-lookup — never automatic, even on an exact email match (docs/12-BACKEND-HRM.md A.5).
    /// </summary>
    public int? LinkEmployeeId { get; set; }
+
+    /// <summary>
+    /// Required, together with <see cref="DepartmentId"/>/<see cref="DesignationId"/>/
+    /// <see cref="EmploymentTypeId"/>/<see cref="WorkShiftId"/>/<see cref="BranchId"/>, whenever
+    /// the assigned Role is not Admin and <see cref="LinkEmployeeId"/> is not supplied: creates
+    /// the linked Employee record whose BranchId is what actually scopes this account to one
+    /// branch (see BranchAccessService.EnsureBranchVisibleAsync).
+    /// </summary>
+    public string? EmployeeCode { get; set; }
+    public int? BranchId { get; set; }
+    public int? DepartmentId { get; set; }
+    public int? DesignationId { get; set; }
+    public int? EmploymentTypeId { get; set; }
+    public int? WorkShiftId { get; set; }
+    /// <summary>Defaults to today when omitted.</summary>
+    public DateTime? HireDate { get; set; }
 }

 public sealed class UpdateUserRoleRequest
@@ -37,5 +53,10 @@ public sealed class UpdateUserRoleRequest
    [Required] public int RoleId { get; set; }
 }

+public sealed class UpdateUserStatusRequest
+{
+    [Required, EnumDataType(typeof(EntityStatus))] public EntityStatus Status { get; set; }
+}
+
 /// <summary>AuthHex UserType lookup, for populating the create-user form's select (no local shadow — read-only passthrough).</summary>
 public sealed record UserTypeOptionDto(Guid UserTypeId, string? Code, string? Description);
@@ -2,8 +2,10 @@ using System.ComponentModel.DataAnnotations;

 namespace ERPCore.Dtos.Warehouses;

-/// <summary>Warehouse resource (docs/11-BACKEND-PHASE1.md §2.5).</summary>
-public sealed record WarehouseDto(int WarehouseId, string Code, string Name);
+/// <summary>Warehouse resource (docs/11-BACKEND-PHASE1.md §2.5). <see cref="BranchId"/> is
+/// the anchor `docs/BRANCH_ISOLATION_PLAN.md` uses to branch-scope everything that carries
+/// a `warehouseId` (Sales, GRN, stock, ...) without a column on every one of those entities.</summary>
+public sealed record WarehouseDto(int WarehouseId, string Code, string Name, int BranchId, string? BranchName);

 /// <summary>Bin/location resource (docs/11 §2.5).</summary>
 public sealed record BinDto(int BinId, int WarehouseId, string Code, string? BinType);
@@ -12,6 +14,7 @@ public sealed class CreateWarehouseRequest
 {
    [Required, StringLength(50)] public string Code { get; set; } = string.Empty;
    [Required, StringLength(200)] public string Name { get; set; } = string.Empty;
+    [Required] public int BranchId { get; set; }
 }

 public sealed class CreateBinRequest
@@ -31,4 +31,8 @@ public sealed class CurrentUser : ICurrentUser
    }

    public int AuditUserId => int.TryParse(UserId, out var id) ? id : User.SystemUserId;
+
+    public string? RoleCode => _accessor.HttpContext?.User?.FindFirstValue(AuthHexClaims.RoleCode);
+
+    public bool IsAdmin => string.Equals(RoleCode?.Trim(), "Admin", StringComparison.OrdinalIgnoreCase);
 }
@@ -19,4 +19,14 @@ public interface ICurrentUser

    /// <summary>True when the request carries an authenticated principal.</summary>
    bool IsAuthenticated { get; }
+
+    /// <summary>The AuthHex <c>RoleCode</c> claim verbatim, or null if absent/unauthenticated.</summary>
+    string? RoleCode { get; }
+
+    /// <summary>
+    /// True when <see cref="RoleCode"/> is "Admin" (case-insensitive — AuthHex mints the claim
+    /// independently of ERPCore's stored casing). Mirrors <c>RoleService.GetMeAsync</c>'s check;
+    /// the only role that bypasses branch-scoping (see <see cref="Services.Interfaces.IBranchAccessService"/>).
+    /// </summary>
+    bool IsAdmin { get; }
 }
@@ -0,0 +1,39 @@
+namespace ERPCore.Infra.Auth;
+
+/// <summary>
+/// Best-effort "Browser on OS" label from a raw User-Agent string, for display in the
+/// login-device history — not a full parsing library, just enough to be readable
+/// (docs call this out: exact device model detection is out of scope).
+/// </summary>
+public static class UserAgentLabeler
+{
+    public static string Label(string? userAgent)
+    {
+        if (string.IsNullOrWhiteSpace(userAgent)) return "Unknown device";
+
+        var os = DetectOs(userAgent);
+        var browser = DetectBrowser(userAgent);
+        return $"{browser} on {os}";
+    }
+
+    private static string DetectOs(string ua)
+    {
+        if (ua.Contains("Windows", StringComparison.OrdinalIgnoreCase)) return "Windows";
+        if (ua.Contains("Mac OS X", StringComparison.OrdinalIgnoreCase) || ua.Contains("Macintosh", StringComparison.OrdinalIgnoreCase)) return "macOS";
+        if (ua.Contains("Android", StringComparison.OrdinalIgnoreCase)) return "Android";
+        if (ua.Contains("iPhone", StringComparison.OrdinalIgnoreCase) || ua.Contains("iPad", StringComparison.OrdinalIgnoreCase)) return "iOS";
+        if (ua.Contains("Linux", StringComparison.OrdinalIgnoreCase)) return "Linux";
+        return "an unknown OS";
+    }
+
+    private static string DetectBrowser(string ua)
+    {
+        // Order matters: Edge/OPR/Chrome all also contain "Safari"/"Chrome" tokens.
+        if (ua.Contains("Edg/", StringComparison.OrdinalIgnoreCase)) return "Edge";
+        if (ua.Contains("OPR/", StringComparison.OrdinalIgnoreCase) || ua.Contains("Opera", StringComparison.OrdinalIgnoreCase)) return "Opera";
+        if (ua.Contains("Firefox", StringComparison.OrdinalIgnoreCase)) return "Firefox";
+        if (ua.Contains("CriOS", StringComparison.OrdinalIgnoreCase) || ua.Contains("Chrome", StringComparison.OrdinalIgnoreCase)) return "Chrome";
+        if (ua.Contains("Safari", StringComparison.OrdinalIgnoreCase)) return "Safari";
+        return "an unknown browser";
+    }
+}
@@ -21,7 +21,7 @@ public static class AuditScribe
    private static readonly HashSet<Type> Excluded =
    [
        typeof(AuditLog), typeof(JournalEntryStub), typeof(NumberSequence),
-        typeof(StockLedger), typeof(StockLayer),
+        typeof(StockLedger), typeof(StockLayer), typeof(LoginActivity),
    ];

    private static readonly JsonSerializerOptions Json = new()
@@ -0,0 +1,33 @@
+using ERPCore.Domain.Entities;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace ERPCore.Infra.Persistence.Configurations;
+
+/// <summary>
+/// Configures the singleton branch-configuration row. The check constraint is what makes
+/// "singleton" a database guarantee rather than a convention (mirrors ProductConfig).
+/// </summary>
+public sealed class BranchConfigConfiguration : IEntityTypeConfiguration<BranchConfig>
+{
+    public void Configure(EntityTypeBuilder<BranchConfig> builder)
+    {
+        builder.ToTable("branch_config", t =>
+            t.HasCheckConstraint("ck_branch_config_singleton", $"\"ConfigId\" = {BranchConfig.SingletonId}"));
+
+        builder.HasKey(c => c.ConfigId);
+
+        // The id is fixed, never generated — there is exactly one row, seeded by DataSeeder.
+        builder.Property(c => c.ConfigId).ValueGeneratedNever();
+
+        builder.Property(c => c.BranchingEnabled).IsRequired().HasDefaultValue(true);
+
+        // PostgreSQL xmin system column as the optimistic concurrency token (ETag).
+        builder.Property(c => c.RowVersion).IsRowVersion();
+
+        builder.HasOne(c => c.UpdatedByUser)
+            .WithMany()
+            .HasForeignKey(c => c.UpdatedBy)
+            .OnDelete(DeleteBehavior.Restrict);
+    }
+}
@@ -16,6 +16,7 @@ public sealed class BranchConfiguration : IEntityTypeConfiguration<Branch>
        builder.HasIndex(b => b.Code).IsUnique();
        builder.Property(b => b.Name).IsRequired().HasMaxLength(200);
        builder.Property(b => b.Address).HasMaxLength(500);
+        builder.Property(b => b.PhoneNumber).HasMaxLength(30);

        builder.Property(b => b.Status)
            .HasConversion<string>().HasMaxLength(20).IsRequired()
@@ -22,11 +22,13 @@ public sealed class GrnConfiguration : IEntityTypeConfiguration<Grn>
        builder.HasOne(g => g.PurchaseOrder).WithMany().HasForeignKey(g => g.PoId).OnDelete(DeleteBehavior.Restrict);
        builder.HasOne(g => g.Vendor).WithMany().HasForeignKey(g => g.VendorId).OnDelete(DeleteBehavior.Restrict);
        builder.HasOne(g => g.Warehouse).WithMany().HasForeignKey(g => g.WarehouseId).OnDelete(DeleteBehavior.Restrict);
+        builder.HasOne(g => g.Branch).WithMany().HasForeignKey(g => g.BranchId).OnDelete(DeleteBehavior.Restrict);
        builder.HasOne(g => g.Creator).WithMany().HasForeignKey(g => g.CreatedBy).OnDelete(DeleteBehavior.Restrict);
        builder.HasOne(g => g.PurchaseInvoice).WithMany().HasForeignKey(g => g.PurchaseInvoiceId).OnDelete(DeleteBehavior.Restrict);

        builder.HasIndex(g => g.Status);
        builder.HasIndex(g => g.PoId);
+        builder.HasIndex(g => g.BranchId);
    }
 }

@@ -0,0 +1,23 @@
+using ERPCore.Domain.Entities;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace ERPCore.Infra.Persistence.Configurations;
+
+public sealed class LoginActivityConfiguration : IEntityTypeConfiguration<LoginActivity>
+{
+    public void Configure(EntityTypeBuilder<LoginActivity> builder)
+    {
+        builder.ToTable("login_activities");
+        builder.HasKey(l => l.LoginActivityId);
+
+        builder.Property(l => l.IpAddress).HasMaxLength(64);
+        builder.Property(l => l.UserAgent).HasMaxLength(500);
+        builder.Property(l => l.DeviceLabel).HasMaxLength(200);
+        builder.Property(l => l.LoginAt).IsRequired();
+
+        builder.HasOne(l => l.User).WithMany().HasForeignKey(l => l.UserId).OnDelete(DeleteBehavior.Cascade);
+
+        builder.HasIndex(l => new { l.UserId, l.LoginAt });
+    }
+}
@@ -29,7 +29,8 @@ public sealed class NavItemConfiguration : IEntityTypeConfiguration<NavItem>
        builder.HasData(
            new NavItem { NavItemId = 1, Code = "dashboard", Label = "Dashboard", Href = "/dashboard", SortOrder = 1 },
            new NavItem { NavItemId = 2, Code = "products", Label = "Products", Href = "/dashboard/products", SortOrder = 2 },
-            new NavItem { NavItemId = 3, Code = "vendors", Label = "Vendors", Href = "/dashboard/vendors", SortOrder = 3 },
+            // NavItemId 3 ("vendors") retired 2026-09-09 — Vendors moved under Procurement as a
+            // sub-item (see SubNavItemConfiguration/PermissionConfiguration), matching the sidebar.
            new NavItem { NavItemId = 4, Code = "procurement", Label = "Procurement", Href = "/dashboard/procurement", SortOrder = 4 },
            new NavItem { NavItemId = 5, Code = "receiving", Label = "Receiving", Href = "/dashboard/receiving/grn", SortOrder = 5 },
            new NavItem { NavItemId = 6, Code = "stock", Label = "Stock", Href = "/dashboard/stock", SortOrder = 6 },
@@ -26,7 +26,9 @@ public sealed class PermissionConfiguration : IEntityTypeConfiguration<Permissio
        builder.HasData(
            new Permission { PermissionId = 1, Code = "NAV:dashboard", NavItemId = 1 },
            new Permission { PermissionId = 2, Code = "NAV:products", NavItemId = 2 },
-            new Permission { PermissionId = 3, Code = "NAV:vendors", NavItemId = 3 },
+            // Moved under Procurement as a sub-item (2026-09-09) — same PermissionId (3), just
+            // repointed to the new SubNavItem, so any role already granted this permission keeps it.
+            new Permission { PermissionId = 3, Code = "NAV:procurement.vendors", SubNavItemId = 30 },
            new Permission { PermissionId = 4, Code = "NAV:procurement", NavItemId = 4 },
            new Permission { PermissionId = 5, Code = "NAV:receiving", NavItemId = 5 },
            new Permission { PermissionId = 6, Code = "NAV:stock", NavItemId = 6 },
@@ -66,7 +68,22 @@ public sealed class PermissionConfiguration : IEntityTypeConfiguration<Permissio
            new Permission { PermissionId = 36, Code = "NAV:production.templates", SubNavItemId = 27 },
            new Permission { PermissionId = 37, Code = "NAV:production.runs", SubNavItemId = 25 },
            new Permission { PermissionId = 38, Code = "NAV:production.produced", SubNavItemId = 26 },
-            new Permission { PermissionId = 39, Code = "NAV:procurement.purchase-invoices", SubNavItemId = 28 }
+            new Permission { PermissionId = 39, Code = "NAV:procurement.purchase-invoices", SubNavItemId = 28 },
+            new Permission { PermissionId = 40, Code = "NAV:settings.branches", SubNavItemId = 29 },
+            new Permission { PermissionId = 41, Code = "NAV:stock.ledger", SubNavItemId = 31 },
+            new Permission { PermissionId = 42, Code = "NAV:stock.enquiry", SubNavItemId = 32 },
+            new Permission { PermissionId = 43, Code = "NAV:stock.valuation", SubNavItemId = 33 },
+            new Permission { PermissionId = 44, Code = "NAV:stock.transfers", SubNavItemId = 34 },
+            new Permission { PermissionId = 45, Code = "NAV:stock.adjustments", SubNavItemId = 35 },
+            new Permission { PermissionId = 46, Code = "NAV:stock.counts", SubNavItemId = 36 },
+            new Permission { PermissionId = 47, Code = "NAV:stock.reorder-alerts", SubNavItemId = 37 },
+            new Permission { PermissionId = 48, Code = "NAV:stock.wastage", SubNavItemId = 38 },
+            // Sales (NavItemId 13) children — SubNavItemId 23 had no permission row before now
+            // (mirrors SubNavItemConfiguration's rename of that row to sales.bundle-templates).
+            new Permission { PermissionId = 49, Code = "NAV:sales.bundle-templates", SubNavItemId = 23 },
+            new Permission { PermissionId = 50, Code = "NAV:sales.invoices", SubNavItemId = 40 },
+            new Permission { PermissionId = 51, Code = "NAV:sales.free-issues", SubNavItemId = 41 },
+            new Permission { PermissionId = 52, Code = "NAV:sales.day-end", SubNavItemId = 42 }
        );
    }
 }
@@ -30,6 +30,11 @@ public sealed class SalesInvoiceConfiguration : IEntityTypeConfiguration<SalesIn
            .HasForeignKey(x => x.WarehouseId)
            .OnDelete(DeleteBehavior.Restrict);

+        builder.HasOne(x => x.Branch)
+            .WithMany()
+            .HasForeignKey(x => x.BranchId)
+            .OnDelete(DeleteBehavior.Restrict);
+
        builder.Property(x => x.InvoiceType)
            .HasConversion<string>().HasMaxLength(20).IsRequired()
            .HasDefaultValue(SalesInvoiceType.B2C);
@@ -47,6 +52,7 @@ public sealed class SalesInvoiceConfiguration : IEntityTypeConfiguration<SalesIn

        builder.HasIndex(x => x.Status);
        builder.HasIndex(x => x.InvoiceDate);
+        builder.HasIndex(x => x.BranchId);

        builder.HasMany(x => x.Lines)
            .WithOne(x => x.SalesInvoice)
@@ -21,7 +21,10 @@ public sealed class StockAdjustmentConfiguration : IEntityTypeConfiguration<Stoc

        builder.HasOne(a => a.Warehouse).WithMany().HasForeignKey(a => a.WarehouseId).OnDelete(DeleteBehavior.Restrict);
        builder.HasOne(a => a.ReasonCode).WithMany().HasForeignKey(a => a.ReasonCodeId).OnDelete(DeleteBehavior.Restrict);
+        builder.HasOne(a => a.Branch).WithMany().HasForeignKey(a => a.BranchId).OnDelete(DeleteBehavior.Restrict);
        builder.HasOne(a => a.Creator).WithMany().HasForeignKey(a => a.CreatedBy).OnDelete(DeleteBehavior.Restrict);
+
+        builder.HasIndex(a => a.BranchId);
    }
 }

@@ -20,9 +20,11 @@ public sealed class StockCountConfiguration : IEntityTypeConfiguration<StockCoun
        builder.Property(c => c.RowVersion).IsRowVersion();

        builder.HasOne(c => c.Warehouse).WithMany().HasForeignKey(c => c.WarehouseId).OnDelete(DeleteBehavior.Restrict);
+        builder.HasOne(c => c.Branch).WithMany().HasForeignKey(c => c.BranchId).OnDelete(DeleteBehavior.Restrict);
        builder.HasOne(c => c.Creator).WithMany().HasForeignKey(c => c.CreatedBy).OnDelete(DeleteBehavior.Restrict);

        builder.HasIndex(c => c.Status);
+        builder.HasIndex(c => c.BranchId);
    }
 }

@@ -20,9 +20,11 @@ public sealed class StockTransferConfiguration : IEntityTypeConfiguration<StockT

        builder.HasOne(t => t.SrcWarehouse).WithMany().HasForeignKey(t => t.SrcWarehouseId).OnDelete(DeleteBehavior.Restrict);
        builder.HasOne(t => t.DestWarehouse).WithMany().HasForeignKey(t => t.DestWarehouseId).OnDelete(DeleteBehavior.Restrict);
+        builder.HasOne(t => t.Branch).WithMany().HasForeignKey(t => t.BranchId).OnDelete(DeleteBehavior.Restrict);
        builder.HasOne(t => t.Creator).WithMany().HasForeignKey(t => t.CreatedBy).OnDelete(DeleteBehavior.Restrict);

        builder.HasIndex(t => t.Status);
+        builder.HasIndex(t => t.BranchId);
    }
 }

@@ -31,13 +31,23 @@ public sealed class SubNavItemConfiguration : IEntityTypeConfiguration<SubNavIte
            new SubNavItem { SubNavItemId = 4, NavItemId = 2, Code = "products.item-type", Label = "Item Type", Href = "/dashboard/products/item-types", SortOrder = 4 },
            new SubNavItem { SubNavItemId = 5, NavItemId = 2, Code = "products.uom", Label = "UOM", Href = "/dashboard/products/uoms", SortOrder = 5 },
            new SubNavItem { SubNavItemId = 6, NavItemId = 2, Code = "products.configuration", Label = "Configuration", Href = "/dashboard/products/settings", SortOrder = 6 },
+            new SubNavItem { SubNavItemId = 29, NavItemId = 9, Code = "settings.branches", Label = "Branches", Href = "/dashboard/settings/branches", SortOrder = 0 },
            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 = 24, NavItemId = 9, Code = "settings.notification-config", Label = "Notification Config", Href = "/dashboard/settings/notification-config", SortOrder = 3 },
-            new SubNavItem { SubNavItemId = 23, NavItemId = 13, Code = "sales.bundle-sales", Label = "Bundle Sales", Href = "/dashboard/sales/bundles", SortOrder = 1 },
+            // Sales (NavItemId 13) children — mirror the sidebar order (AppSidebar.tsx). SubNavItemId
+            // 23 is renamed in place (was "sales.bundle-sales" / Bundle Sales) rather than
+            // delete+recreate, so any role already granted this permission keeps it; the rest are new.
+            new SubNavItem { SubNavItemId = 40, NavItemId = 13, Code = "sales.invoices", Label = "Sales", Href = "/dashboard/sales/invoices", SortOrder = 1 },
+            new SubNavItem { SubNavItemId = 23, NavItemId = 13, Code = "sales.bundle-templates", Label = "Bundle Templates", Href = "/dashboard/sales/bundles/templates", SortOrder = 2 },
+            new SubNavItem { SubNavItemId = 41, NavItemId = 13, Code = "sales.free-issues", Label = "Free Issues", Href = "/dashboard/sales/free-issues", SortOrder = 3 },
+            new SubNavItem { SubNavItemId = 42, NavItemId = 13, Code = "sales.day-end", Label = "Day End", Href = "/dashboard/sales/day-end", SortOrder = 4 },
            // Procurement (NavItemId 4) children — mirror the hub page order.
            // 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.
+            // Vendors (SubNavItemId 30) reuses PermissionId 3, which used to point at the retired
+            // top-level "vendors" NavItem — so any role already granted this permission keeps it.
+            new SubNavItem { SubNavItemId = 30, NavItemId = 4, Code = "procurement.vendors", Label = "Vendors", Href = "/dashboard/vendors", SortOrder = 0 },
            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 },
@@ -63,7 +73,18 @@ public sealed class SubNavItemConfiguration : IEntityTypeConfiguration<SubNavIte
            // FixProductionTemplatesSubNavItemIdConflict for the data repair.
            new SubNavItem { SubNavItemId = 27, NavItemId = 14, Code = "production.templates", Label = "Templates", Href = "/dashboard/production/templates", SortOrder = 1 },
            new SubNavItem { SubNavItemId = 25, NavItemId = 14, Code = "production.runs", Label = "Runs", Href = "/dashboard/production/runs", SortOrder = 2 },
-            new SubNavItem { SubNavItemId = 26, NavItemId = 14, Code = "production.produced", Label = "Produced", Href = "/dashboard/production/produced", SortOrder = 3 }
+            new SubNavItem { SubNavItemId = 26, NavItemId = 14, Code = "production.produced", Label = "Produced", Href = "/dashboard/production/produced", SortOrder = 3 },
+            // Stock (NavItemId 6) children — mirror the sidebar order (AppSidebar.tsx). These rows
+            // never existed in the database before now, so "stock" is still bypassed frontend-side
+            // in AppSidebar.tsx until roles are actually granted these permissions.
+            new SubNavItem { SubNavItemId = 31, NavItemId = 6, Code = "stock.ledger", Label = "Stock Ledger", Href = "/dashboard/stock/ledger", SortOrder = 1 },
+            new SubNavItem { SubNavItemId = 32, NavItemId = 6, Code = "stock.enquiry", Label = "Stock Enquiry", Href = "/dashboard/stock/enquiry", SortOrder = 2 },
+            new SubNavItem { SubNavItemId = 33, NavItemId = 6, Code = "stock.valuation", Label = "Valuation", Href = "/dashboard/stock/valuation", SortOrder = 3 },
+            new SubNavItem { SubNavItemId = 34, NavItemId = 6, Code = "stock.transfers", Label = "Transfers", Href = "/dashboard/stock/transfers", SortOrder = 4 },
+            new SubNavItem { SubNavItemId = 35, NavItemId = 6, Code = "stock.adjustments", Label = "Adjustments", Href = "/dashboard/stock/adjustments", SortOrder = 5 },
+            new SubNavItem { SubNavItemId = 36, NavItemId = 6, Code = "stock.counts", Label = "Counts", Href = "/dashboard/stock/counts", SortOrder = 6 },
+            new SubNavItem { SubNavItemId = 37, NavItemId = 6, Code = "stock.reorder-alerts", Label = "Reorder Alerts", Href = "/dashboard/stock/reorder-alerts", SortOrder = 7 },
+            new SubNavItem { SubNavItemId = 38, NavItemId = 6, Code = "stock.wastage", Label = "Wastage", Href = "/dashboard/stock/wastage", SortOrder = 8 }
        );
    }
 }
@@ -15,5 +15,9 @@ public sealed class WarehouseConfiguration : IEntityTypeConfiguration<Warehouse>
        builder.HasIndex(w => w.Code).IsUnique();

        builder.Property(w => w.Name).IsRequired().HasMaxLength(200);
+
+        builder.HasOne(w => w.Branch).WithMany()
+            .HasForeignKey(w => w.BranchId).OnDelete(DeleteBehavior.Restrict);
+        builder.HasIndex(w => w.BranchId);
    }
 }
@@ -45,6 +45,7 @@ public static class DataSeeder
        dirty |= await SeedItemTypesAsync(db, ct);
        // dirty |= await SeedCompanyProfileAsync(db, ct);
        dirty |= await SeedProductConfigAsync(db, ct);
+        dirty |= await SeedBranchConfigAsync(db, ct);
        dirty |= await SeedNotificationConfigAsync(db, ct);
        dirty |= await SeedSalesMastersAsync(db, ct);
        dirty |= await SeedSalesStockAsync(db, ct);
@@ -110,6 +111,23 @@ public static class DataSeeder
        return true;
    }

+    /// <summary>
+    /// Ensures the singleton branch-config row exists. New deployments start with branching
+    /// on — today's mandatory-branch behaviour — so nothing changes for anyone until an
+    /// admin deliberately switches it off from Settings.
+    /// </summary>
+    private static async Task<bool> SeedBranchConfigAsync(ErpDbContext db, CancellationToken ct)
+    {
+        if (await db.BranchConfig.AnyAsync(c => c.ConfigId == BranchConfig.SingletonId, ct)) return false;
+
+        db.BranchConfig.Add(new BranchConfig
+        {
+            ConfigId = BranchConfig.SingletonId,
+            BranchingEnabled = true
+        });
+        return true;
+    }
+
    private static async Task<bool> SeedNotificationConfigAsync(ErpDbContext db, CancellationToken ct)
    {
        if (await db.NotificationConfig.AnyAsync(c => c.NotificationConfigId == NotificationConfig.SingletonId, ct)) return false;
@@ -38,6 +38,8 @@ public class ErpDbContext : DbContext
    
    /// <summary>Singleton row (FR-MD-11).</summary>
    public DbSet<ProductConfig> ProductConfig => Set<ProductConfig>();
+    /// <summary>Singleton row gating whether this deployment uses branches at all.</summary>
+    public DbSet<BranchConfig> BranchConfig => Set<BranchConfig>();
    /// <summary>Singleton row for notification delivery preferences.</summary>
    public DbSet<NotificationConfig> NotificationConfig => Set<NotificationConfig>();
    public DbSet<NotificationConfigModule> NotificationConfigModules => Set<NotificationConfigModule>();
@@ -112,6 +114,7 @@ public class ErpDbContext : DbContext
    // --- Cross-cutting: audit trail + GL-ready journal (docs/10 Part C.7) ---
    public DbSet<AuditLog> AuditLogs => Set<AuditLog>();
    public DbSet<JournalEntryStub> JournalEntryStubs => Set<JournalEntryStub>();
+    public DbSet<LoginActivity> LoginActivities => Set<LoginActivity>();

    // --- HRM: org masters (docs/12-BACKEND-HRM.md Part C.1) ---
    public DbSet<Branch> Branches => Set<Branch>();
@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ERPCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddBranchPhoneNumberAndCodeAutogen : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "PhoneNumber",
+                table: "hr_branches",
+                type: "character varying(30)",
+                maxLength: 30,
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "PhoneNumber",
+                table: "hr_branches");
+        }
+    }
+}
@@ -0,0 +1,38 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ERPCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddSettingsBranchesNavItem : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.InsertData(
+                table: "sub_nav_items",
+                columns: new[] { "SubNavItemId", "Code", "Href", "Icon", "Label", "NavItemId", "SortOrder" },
+                values: new object[] { 29, "settings.branches", "/dashboard/settings/branches", null, "Branches", 9, 0 });
+
+            migrationBuilder.InsertData(
+                table: "permissions",
+                columns: new[] { "PermissionId", "Code", "NavItemId", "SubNavItemId" },
+                values: new object[] { 40, "NAV:settings.branches", null, 29 });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DeleteData(
+                table: "permissions",
+                keyColumn: "PermissionId",
+                keyValue: 40);
+
+            migrationBuilder.DeleteData(
+                table: "sub_nav_items",
+                keyColumn: "SubNavItemId",
+                keyValue: 29);
+        }
+    }
+}
@@ -0,0 +1,50 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ERPCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class MakeEmployeeBranchRequired : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            // Branch becomes a required field on Employee going forward. Any pre-existing
+            // employee left with no branch is backfilled to a "Main Branch" placeholder
+            // (created only if it doesn't already exist) so the NOT NULL below never fails
+            // on live data.
+            migrationBuilder.Sql(@"
+                INSERT INTO hr_branches (""Code"", ""Name"", ""Status"", ""CreatedAt"")
+                SELECT 'BR-000', 'Main Branch', 'Active', now()
+                WHERE NOT EXISTS (SELECT 1 FROM hr_branches WHERE ""Code"" = 'BR-000')
+                  AND EXISTS (SELECT 1 FROM hr_employees WHERE ""BranchId"" IS NULL);
+
+                UPDATE hr_employees
+                SET ""BranchId"" = (SELECT ""BranchId"" FROM hr_branches WHERE ""Code"" = 'BR-000')
+                WHERE ""BranchId"" IS NULL;
+            ");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "BranchId",
+                table: "hr_employees",
+                type: "integer",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "integer",
+                oldNullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<int>(
+                name: "BranchId",
+                table: "hr_employees",
+                type: "integer",
+                nullable: true,
+                oldClrType: typeof(int),
+                oldType: "integer");
+        }
+    }
+}
@@ -0,0 +1,73 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ERPCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddWarehouseBranch : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "BranchId",
+                table: "warehouses",
+                type: "integer",
+                nullable: true);
+
+            // Backfill any pre-existing warehouse onto the same "Main Branch" placeholder
+            // used by the earlier MakeEmployeeBranchRequired migration (created only if it
+            // doesn't already exist) — keeps a single de-facto default rather than minting
+            // a second one — before the column is locked to NOT NULL below.
+            migrationBuilder.Sql(@"
+                INSERT INTO hr_branches (""Code"", ""Name"", ""Status"", ""CreatedAt"")
+                SELECT 'BR-000', 'Main Branch', 'Active', now()
+                WHERE NOT EXISTS (SELECT 1 FROM hr_branches WHERE ""Code"" = 'BR-000')
+                  AND EXISTS (SELECT 1 FROM warehouses WHERE ""BranchId"" IS NULL);
+
+                UPDATE warehouses
+                SET ""BranchId"" = (SELECT ""BranchId"" FROM hr_branches WHERE ""Code"" = 'BR-000')
+                WHERE ""BranchId"" IS NULL;
+            ");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "BranchId",
+                table: "warehouses",
+                type: "integer",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldType: "integer",
+                oldNullable: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_warehouses_BranchId",
+                table: "warehouses",
+                column: "BranchId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_warehouses_hr_branches_BranchId",
+                table: "warehouses",
+                column: "BranchId",
+                principalTable: "hr_branches",
+                principalColumn: "BranchId",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_warehouses_hr_branches_BranchId",
+                table: "warehouses");
+
+            migrationBuilder.DropIndex(
+                name: "IX_warehouses_BranchId",
+                table: "warehouses");
+
+            migrationBuilder.DropColumn(
+                name: "BranchId",
+                table: "warehouses");
+        }
+    }
+}
@@ -0,0 +1,49 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ERPCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddBranchConfig : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "branch_config",
+                columns: table => new
+                {
+                    ConfigId = table.Column<int>(type: "integer", nullable: false),
+                    BranchingEnabled = 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_branch_config", x => x.ConfigId);
+                    table.CheckConstraint("ck_branch_config_singleton", "\"ConfigId\" = 1");
+                    table.ForeignKey(
+                        name: "FK_branch_config_users_UpdatedBy",
+                        column: x => x.UpdatedBy,
+                        principalTable: "users",
+                        principalColumn: "UserId",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_branch_config_UpdatedBy",
+                table: "branch_config",
+                column: "UpdatedBy");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "branch_config");
+        }
+    }
+}
@@ -0,0 +1,199 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ERPCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddBranchIdToDocuments : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "BranchId",
+                table: "stock_transfers",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "BranchId",
+                table: "stock_counts",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "BranchId",
+                table: "stock_adjustments",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "BranchId",
+                table: "sales_invoices",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "BranchId",
+                table: "grns",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_stock_transfers_BranchId",
+                table: "stock_transfers",
+                column: "BranchId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_stock_counts_BranchId",
+                table: "stock_counts",
+                column: "BranchId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_stock_adjustments_BranchId",
+                table: "stock_adjustments",
+                column: "BranchId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_sales_invoices_BranchId",
+                table: "sales_invoices",
+                column: "BranchId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_grns_BranchId",
+                table: "grns",
+                column: "BranchId");
+
+            // Backfill from each document's existing warehouse — warehouses were the sole
+            // branch anchor until now, so this preserves current branch assignment exactly.
+            // (Warehouse.BranchId is NOT NULL, so every row is resolvable; the WHERE BranchId = 0
+            // guard just keeps this idempotent if the migration is ever re-run against partial state.)
+            migrationBuilder.Sql(@"
+                UPDATE grns g SET ""BranchId"" = w.""BranchId""
+                FROM warehouses w WHERE w.""WarehouseId"" = g.""WarehouseId"" AND g.""BranchId"" = 0;
+
+                UPDATE sales_invoices x SET ""BranchId"" = w.""BranchId""
+                FROM warehouses w WHERE w.""WarehouseId"" = x.""WarehouseId"" AND x.""BranchId"" = 0;
+
+                UPDATE stock_counts c SET ""BranchId"" = w.""BranchId""
+                FROM warehouses w WHERE w.""WarehouseId"" = c.""WarehouseId"" AND c.""BranchId"" = 0;
+
+                UPDATE stock_adjustments a SET ""BranchId"" = w.""BranchId""
+                FROM warehouses w WHERE w.""WarehouseId"" = a.""WarehouseId"" AND a.""BranchId"" = 0;
+
+                UPDATE stock_transfers t SET ""BranchId"" = w.""BranchId""
+                FROM warehouses w WHERE w.""WarehouseId"" = t.""SrcWarehouseId"" AND t.""BranchId"" = 0;
+            ");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_grns_hr_branches_BranchId",
+                table: "grns",
+                column: "BranchId",
+                principalTable: "hr_branches",
+                principalColumn: "BranchId",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_sales_invoices_hr_branches_BranchId",
+                table: "sales_invoices",
+                column: "BranchId",
+                principalTable: "hr_branches",
+                principalColumn: "BranchId",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_stock_adjustments_hr_branches_BranchId",
+                table: "stock_adjustments",
+                column: "BranchId",
+                principalTable: "hr_branches",
+                principalColumn: "BranchId",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_stock_counts_hr_branches_BranchId",
+                table: "stock_counts",
+                column: "BranchId",
+                principalTable: "hr_branches",
+                principalColumn: "BranchId",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_stock_transfers_hr_branches_BranchId",
+                table: "stock_transfers",
+                column: "BranchId",
+                principalTable: "hr_branches",
+                principalColumn: "BranchId",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_grns_hr_branches_BranchId",
+                table: "grns");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_sales_invoices_hr_branches_BranchId",
+                table: "sales_invoices");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_stock_adjustments_hr_branches_BranchId",
+                table: "stock_adjustments");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_stock_counts_hr_branches_BranchId",
+                table: "stock_counts");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_stock_transfers_hr_branches_BranchId",
+                table: "stock_transfers");
+
+            migrationBuilder.DropIndex(
+                name: "IX_stock_transfers_BranchId",
+                table: "stock_transfers");
+
+            migrationBuilder.DropIndex(
+                name: "IX_stock_counts_BranchId",
+                table: "stock_counts");
+
+            migrationBuilder.DropIndex(
+                name: "IX_stock_adjustments_BranchId",
+                table: "stock_adjustments");
+
+            migrationBuilder.DropIndex(
+                name: "IX_sales_invoices_BranchId",
+                table: "sales_invoices");
+
+            migrationBuilder.DropIndex(
+                name: "IX_grns_BranchId",
+                table: "grns");
+
+            migrationBuilder.DropColumn(
+                name: "BranchId",
+                table: "stock_transfers");
+
+            migrationBuilder.DropColumn(
+                name: "BranchId",
+                table: "stock_counts");
+
+            migrationBuilder.DropColumn(
+                name: "BranchId",
+                table: "stock_adjustments");
+
+            migrationBuilder.DropColumn(
+                name: "BranchId",
+                table: "sales_invoices");
+
+            migrationBuilder.DropColumn(
+                name: "BranchId",
+                table: "grns");
+        }
+    }
+}
@@ -0,0 +1,55 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ERPCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class MoveVendorsUnderProcurement : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            // Order matters: Permission.NavItemId cascades on delete, so the permission row must be
+            // repointed off NavItemId 3 (via the new sub_nav_item) before that nav_item is deleted —
+            // otherwise the delete cascades and removes the permission row first.
+            migrationBuilder.InsertData(
+                table: "sub_nav_items",
+                columns: new[] { "SubNavItemId", "Code", "Href", "Icon", "Label", "NavItemId", "SortOrder" },
+                values: new object[] { 30, "procurement.vendors", "/dashboard/vendors", null, "Vendors", 4, 0 });
+
+            migrationBuilder.UpdateData(
+                table: "permissions",
+                keyColumn: "PermissionId",
+                keyValue: 3,
+                columns: new[] { "Code", "NavItemId", "SubNavItemId" },
+                values: new object[] { "NAV:procurement.vendors", null, 30 });
+
+            migrationBuilder.DeleteData(
+                table: "nav_items",
+                keyColumn: "NavItemId",
+                keyValue: 3);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DeleteData(
+                table: "sub_nav_items",
+                keyColumn: "SubNavItemId",
+                keyValue: 30);
+
+            migrationBuilder.InsertData(
+                table: "nav_items",
+                columns: new[] { "NavItemId", "Code", "Href", "Icon", "Label", "SortOrder", "Status" },
+                values: new object[] { 3, "vendors", "/dashboard/vendors", null, "Vendors", 3, "Active" });
+
+            migrationBuilder.UpdateData(
+                table: "permissions",
+                keyColumn: "PermissionId",
+                keyValue: 3,
+                columns: new[] { "Code", "NavItemId", "SubNavItemId" },
+                values: new object[] { "NAV:vendors", 3, null });
+        }
+    }
+}
@@ -0,0 +1,130 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional
+
+namespace ERPCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddStockSubNavItems : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.InsertData(
+                table: "sub_nav_items",
+                columns: new[] { "SubNavItemId", "Code", "Href", "Icon", "Label", "NavItemId", "SortOrder" },
+                values: new object[,]
+                {
+                    { 31, "stock.ledger", "/dashboard/stock/ledger", null, "Stock Ledger", 6, 1 },
+                    { 32, "stock.enquiry", "/dashboard/stock/enquiry", null, "Stock Enquiry", 6, 2 },
+                    { 33, "stock.valuation", "/dashboard/stock/valuation", null, "Valuation", 6, 3 },
+                    { 34, "stock.transfers", "/dashboard/stock/transfers", null, "Transfers", 6, 4 },
+                    { 35, "stock.adjustments", "/dashboard/stock/adjustments", null, "Adjustments", 6, 5 },
+                    { 36, "stock.counts", "/dashboard/stock/counts", null, "Counts", 6, 6 },
+                    { 37, "stock.reorder-alerts", "/dashboard/stock/reorder-alerts", null, "Reorder Alerts", 6, 7 },
+                    { 38, "stock.wastage", "/dashboard/stock/wastage", null, "Wastage", 6, 8 }
+                });
+
+            migrationBuilder.InsertData(
+                table: "permissions",
+                columns: new[] { "PermissionId", "Code", "NavItemId", "SubNavItemId" },
+                values: new object[,]
+                {
+                    { 41, "NAV:stock.ledger", null, 31 },
+                    { 42, "NAV:stock.enquiry", null, 32 },
+                    { 43, "NAV:stock.valuation", null, 33 },
+                    { 44, "NAV:stock.transfers", null, 34 },
+                    { 45, "NAV:stock.adjustments", null, 35 },
+                    { 46, "NAV:stock.counts", null, 36 },
+                    { 47, "NAV:stock.reorder-alerts", null, 37 },
+                    { 48, "NAV:stock.wastage", null, 38 }
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DeleteData(
+                table: "permissions",
+                keyColumn: "PermissionId",
+                keyValue: 41);
+
+            migrationBuilder.DeleteData(
+                table: "permissions",
+                keyColumn: "PermissionId",
+                keyValue: 42);
+
+            migrationBuilder.DeleteData(
+                table: "permissions",
+                keyColumn: "PermissionId",
+                keyValue: 43);
+
+            migrationBuilder.DeleteData(
+                table: "permissions",
+                keyColumn: "PermissionId",
+                keyValue: 44);
+
+            migrationBuilder.DeleteData(
+                table: "permissions",
+                keyColumn: "PermissionId",
+                keyValue: 45);
+
+            migrationBuilder.DeleteData(
+                table: "permissions",
+                keyColumn: "PermissionId",
+                keyValue: 46);
+
+            migrationBuilder.DeleteData(
+                table: "permissions",
+                keyColumn: "PermissionId",
+                keyValue: 47);
+
+            migrationBuilder.DeleteData(
+                table: "permissions",
+                keyColumn: "PermissionId",
+                keyValue: 48);
+
+            migrationBuilder.DeleteData(
+                table: "sub_nav_items",
+                keyColumn: "SubNavItemId",
+                keyValue: 31);
+
+            migrationBuilder.DeleteData(
+                table: "sub_nav_items",
+                keyColumn: "SubNavItemId",
+                keyValue: 32);
+
+            migrationBuilder.DeleteData(
+                table: "sub_nav_items",
+                keyColumn: "SubNavItemId",
+                keyValue: 33);
+
+            migrationBuilder.DeleteData(
+                table: "sub_nav_items",
+                keyColumn: "SubNavItemId",
+                keyValue: 34);
+
+            migrationBuilder.DeleteData(
+                table: "sub_nav_items",
+                keyColumn: "SubNavItemId",
+                keyValue: 35);
+
+            migrationBuilder.DeleteData(
+                table: "sub_nav_items",
+                keyColumn: "SubNavItemId",
+                keyValue: 36);
+
+            migrationBuilder.DeleteData(
+                table: "sub_nav_items",
+                keyColumn: "SubNavItemId",
+                keyValue: 37);
+
+            migrationBuilder.DeleteData(
+                table: "sub_nav_items",
+                keyColumn: "SubNavItemId",
+                keyValue: 38);
+        }
+    }
+}
@@ -0,0 +1,94 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional
+
+namespace ERPCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddSalesSubNavItems : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.InsertData(
+                table: "permissions",
+                columns: new[] { "PermissionId", "Code", "NavItemId", "SubNavItemId" },
+                values: new object[] { 49, "NAV:sales.bundle-templates", null, 23 });
+
+            migrationBuilder.UpdateData(
+                table: "sub_nav_items",
+                keyColumn: "SubNavItemId",
+                keyValue: 23,
+                columns: new[] { "Code", "Href", "Label", "SortOrder" },
+                values: new object[] { "sales.bundle-templates", "/dashboard/sales/bundles/templates", "Bundle Templates", 2 });
+
+            migrationBuilder.InsertData(
+                table: "sub_nav_items",
+                columns: new[] { "SubNavItemId", "Code", "Href", "Icon", "Label", "NavItemId", "SortOrder" },
+                values: new object[,]
+                {
+                    { 40, "sales.invoices", "/dashboard/sales/invoices", null, "Sales", 13, 1 },
+                    { 41, "sales.free-issues", "/dashboard/sales/free-issues", null, "Free Issues", 13, 3 },
+                    { 42, "sales.day-end", "/dashboard/sales/day-end", null, "Day End", 13, 4 }
+                });
+
+            migrationBuilder.InsertData(
+                table: "permissions",
+                columns: new[] { "PermissionId", "Code", "NavItemId", "SubNavItemId" },
+                values: new object[,]
+                {
+                    { 50, "NAV:sales.invoices", null, 40 },
+                    { 51, "NAV:sales.free-issues", null, 41 },
+                    { 52, "NAV:sales.day-end", null, 42 }
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DeleteData(
+                table: "permissions",
+                keyColumn: "PermissionId",
+                keyValue: 49);
+
+            migrationBuilder.DeleteData(
+                table: "permissions",
+                keyColumn: "PermissionId",
+                keyValue: 50);
+
+            migrationBuilder.DeleteData(
+                table: "permissions",
+                keyColumn: "PermissionId",
+                keyValue: 51);
+
+            migrationBuilder.DeleteData(
+                table: "permissions",
+                keyColumn: "PermissionId",
+                keyValue: 52);
+
+            migrationBuilder.DeleteData(
+                table: "sub_nav_items",
+                keyColumn: "SubNavItemId",
+                keyValue: 40);
+
+            migrationBuilder.DeleteData(
+                table: "sub_nav_items",
+                keyColumn: "SubNavItemId",
+                keyValue: 41);
+
+            migrationBuilder.DeleteData(
+                table: "sub_nav_items",
+                keyColumn: "SubNavItemId",
+                keyValue: 42);
+
+            migrationBuilder.UpdateData(
+                table: "sub_nav_items",
+                keyColumn: "SubNavItemId",
+                keyValue: 23,
+                columns: new[] { "Code", "Href", "Label", "SortOrder" },
+                values: new object[] { "sales.bundle-sales", "/dashboard/sales/bundles", "Bundle Sales", 1 });
+        }
+    }
+}
@@ -0,0 +1,51 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace ERPCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddLoginActivity : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "login_activities",
+                columns: table => new
+                {
+                    LoginActivityId = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    UserId = table.Column<int>(type: "integer", nullable: false),
+                    IpAddress = table.Column<string>(type: "character varying(64)", maxLength: 64, nullable: true),
+                    UserAgent = table.Column<string>(type: "character varying(500)", maxLength: 500, nullable: true),
+                    DeviceLabel = table.Column<string>(type: "character varying(200)", maxLength: 200, nullable: true),
+                    LoginAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_login_activities", x => x.LoginActivityId);
+                    table.ForeignKey(
+                        name: "FK_login_activities_users_UserId",
+                        column: x => x.UserId,
+                        principalTable: "users",
+                        principalColumn: "UserId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_login_activities_UserId_LoginAt",
+                table: "login_activities",
+                columns: new[] { "UserId", "LoginAt" });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "login_activities");
+        }
+    }
+}
@@ -297,6 +297,10 @@ namespace ERPCore.Migrations
                        .HasMaxLength(200)
                        .HasColumnType("character varying(200)");

+                    b.Property<string>("PhoneNumber")
+                        .HasMaxLength(30)
+                        .HasColumnType("character varying(30)");
+
                    b.Property<uint>("RowVersion")
                        .IsConcurrencyToken()
                        .ValueGeneratedOnAddOrUpdate()
@@ -323,6 +327,38 @@ namespace ERPCore.Migrations
                    b.ToTable("hr_branches", (string)null);
                });

+            modelBuilder.Entity("ERPCore.Domain.Entities.BranchConfig", b =>
+                {
+                    b.Property<int>("ConfigId")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("BranchingEnabled")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(true);
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int?>("UpdatedBy")
+                        .HasColumnType("integer");
+
+                    b.HasKey("ConfigId");
+
+                    b.HasIndex("UpdatedBy");
+
+                    b.ToTable("branch_config", null, t =>
+                        {
+                            t.HasCheckConstraint("ck_branch_config_singleton", "\"ConfigId\" = 1");
+                        });
+                });
+
            modelBuilder.Entity("ERPCore.Domain.Entities.Brand", b =>
                {
                    b.Property<int>("BrandId")
@@ -890,7 +926,7 @@ namespace ERPCore.Migrations
                        .HasMaxLength(200)
                        .HasColumnType("character varying(200)");

-                    b.Property<int?>("BranchId")
+                    b.Property<int>("BranchId")
                        .HasColumnType("integer");

                    b.Property<string>("City")
@@ -1411,6 +1447,9 @@ namespace ERPCore.Migrations

                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GrnId"));

+                    b.Property<int>("BranchId")
+                        .HasColumnType("integer");
+
                    b.Property<DateTime>("CreatedAt")
                        .HasColumnType("timestamp with time zone");

@@ -1457,6 +1496,8 @@ namespace ERPCore.Migrations

                    b.HasKey("GrnId");

+                    b.HasIndex("BranchId");
+
                    b.HasIndex("CreatedBy");

                    b.HasIndex("DocNo")
@@ -2130,6 +2171,39 @@ namespace ERPCore.Migrations
                    b.ToTable("hr_loan_installments", (string)null);
                });

+            modelBuilder.Entity("ERPCore.Domain.Entities.LoginActivity", b =>
+                {
+                    b.Property<int>("LoginActivityId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("LoginActivityId"));
+
+                    b.Property<string>("DeviceLabel")
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("IpAddress")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<DateTime>("LoginAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("UserAgent")
+                        .HasMaxLength(500)
+                        .HasColumnType("character varying(500)");
+
+                    b.Property<int>("UserId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("LoginActivityId");
+
+                    b.HasIndex("UserId", "LoginAt");
+
+                    b.ToTable("login_activities", (string)null);
+                });
+
            modelBuilder.Entity("ERPCore.Domain.Entities.NavItem", b =>
                {
                    b.Property<int>("NavItemId")
@@ -2193,15 +2267,6 @@ namespace ERPCore.Migrations
                            Status = "Active"
                        },
                        new
-                        {
-                            NavItemId = 3,
-                            Code = "vendors",
-                            Href = "/dashboard/vendors",
-                            Label = "Vendors",
-                            SortOrder = 3,
-                            Status = "Active"
-                        },
-                        new
                        {
                            NavItemId = 4,
                            Code = "procurement",
@@ -2725,8 +2790,8 @@ namespace ERPCore.Migrations
                        new
                        {
                            PermissionId = 3,
-                            Code = "NAV:vendors",
-                            NavItemId = 3
+                            Code = "NAV:procurement.vendors",
+                            SubNavItemId = 30
                        },
                        new
                        {
@@ -2943,6 +3008,84 @@ namespace ERPCore.Migrations
                            PermissionId = 39,
                            Code = "NAV:procurement.purchase-invoices",
                            SubNavItemId = 28
+                        },
+                        new
+                        {
+                            PermissionId = 40,
+                            Code = "NAV:settings.branches",
+                            SubNavItemId = 29
+                        },
+                        new
+                        {
+                            PermissionId = 41,
+                            Code = "NAV:stock.ledger",
+                            SubNavItemId = 31
+                        },
+                        new
+                        {
+                            PermissionId = 42,
+                            Code = "NAV:stock.enquiry",
+                            SubNavItemId = 32
+                        },
+                        new
+                        {
+                            PermissionId = 43,
+                            Code = "NAV:stock.valuation",
+                            SubNavItemId = 33
+                        },
+                        new
+                        {
+                            PermissionId = 44,
+                            Code = "NAV:stock.transfers",
+                            SubNavItemId = 34
+                        },
+                        new
+                        {
+                            PermissionId = 45,
+                            Code = "NAV:stock.adjustments",
+                            SubNavItemId = 35
+                        },
+                        new
+                        {
+                            PermissionId = 46,
+                            Code = "NAV:stock.counts",
+                            SubNavItemId = 36
+                        },
+                        new
+                        {
+                            PermissionId = 47,
+                            Code = "NAV:stock.reorder-alerts",
+                            SubNavItemId = 37
+                        },
+                        new
+                        {
+                            PermissionId = 48,
+                            Code = "NAV:stock.wastage",
+                            SubNavItemId = 38
+                        },
+                        new
+                        {
+                            PermissionId = 49,
+                            Code = "NAV:sales.bundle-templates",
+                            SubNavItemId = 23
+                        },
+                        new
+                        {
+                            PermissionId = 50,
+                            Code = "NAV:sales.invoices",
+                            SubNavItemId = 40
+                        },
+                        new
+                        {
+                            PermissionId = 51,
+                            Code = "NAV:sales.free-issues",
+                            SubNavItemId = 41
+                        },
+                        new
+                        {
+                            PermissionId = 52,
+                            Code = "NAV:sales.day-end",
+                            SubNavItemId = 42
                        });
                });

@@ -4145,6 +4288,9 @@ namespace ERPCore.Migrations
                        .HasPrecision(18, 4)
                        .HasColumnType("numeric(18,4)");

+                    b.Property<int>("BranchId")
+                        .HasColumnType("integer");
+
                    b.Property<DateTime>("CreatedAt")
                        .HasColumnType("timestamp with time zone");

@@ -4237,6 +4383,8 @@ namespace ERPCore.Migrations

                    b.HasKey("SalesInvoiceId");

+                    b.HasIndex("BranchId");
+
                    b.HasIndex("CreatorUserId");

                    b.HasIndex("CustomerId");
@@ -4817,6 +4965,9 @@ namespace ERPCore.Migrations

                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("AdjustmentId"));

+                    b.Property<int>("BranchId")
+                        .HasColumnType("integer");
+
                    b.Property<DateTime>("CreatedAt")
                        .HasColumnType("timestamp with time zone");

@@ -4854,6 +5005,8 @@ namespace ERPCore.Migrations

                    b.HasKey("AdjustmentId");

+                    b.HasIndex("BranchId");
+
                    b.HasIndex("CreatedBy");

                    b.HasIndex("DocNo")
@@ -4916,6 +5069,9 @@ namespace ERPCore.Migrations

                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("CountId"));

+                    b.Property<int>("BranchId")
+                        .HasColumnType("integer");
+
                    b.Property<string>("CountType")
                        .IsRequired()
                        .HasMaxLength(20)
@@ -4948,6 +5104,8 @@ namespace ERPCore.Migrations

                    b.HasKey("CountId");

+                    b.HasIndex("BranchId");
+
                    b.HasIndex("CreatedBy");

                    b.HasIndex("DocNo")
@@ -5140,6 +5298,9 @@ namespace ERPCore.Migrations

                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("TransferId"));

+                    b.Property<int>("BranchId")
+                        .HasColumnType("integer");
+
                    b.Property<DateTime>("CreatedAt")
                        .HasColumnType("timestamp with time zone");

@@ -5170,6 +5331,8 @@ namespace ERPCore.Migrations

                    b.HasKey("TransferId");

+                    b.HasIndex("BranchId");
+
                    b.HasIndex("CreatedBy");

                    b.HasIndex("DestWarehouseId");
@@ -5394,6 +5557,16 @@ namespace ERPCore.Migrations
                            Status = "Active"
                        },
                        new
+                        {
+                            SubNavItemId = 29,
+                            Code = "settings.branches",
+                            Href = "/dashboard/settings/branches",
+                            Label = "Branches",
+                            NavItemId = 9,
+                            SortOrder = 0,
+                            Status = "Active"
+                        },
+                        new
                        {
                            SubNavItemId = 7,
                            Code = "settings.roles",
@@ -5425,15 +5598,55 @@ namespace ERPCore.Migrations
                        },
                        new
                        {
-                            SubNavItemId = 23,
-                            Code = "sales.bundle-sales",
-                            Href = "/dashboard/sales/bundles",
-                            Label = "Bundle Sales",
+                            SubNavItemId = 40,
+                            Code = "sales.invoices",
+                            Href = "/dashboard/sales/invoices",
+                            Label = "Sales",
                            NavItemId = 13,
                            SortOrder = 1,
                            Status = "Active"
                        },
                        new
+                        {
+                            SubNavItemId = 23,
+                            Code = "sales.bundle-templates",
+                            Href = "/dashboard/sales/bundles/templates",
+                            Label = "Bundle Templates",
+                            NavItemId = 13,
+                            SortOrder = 2,
+                            Status = "Active"
+                        },
+                        new
+                        {
+                            SubNavItemId = 41,
+                            Code = "sales.free-issues",
+                            Href = "/dashboard/sales/free-issues",
+                            Label = "Free Issues",
+                            NavItemId = 13,
+                            SortOrder = 3,
+                            Status = "Active"
+                        },
+                        new
+                        {
+                            SubNavItemId = 42,
+                            Code = "sales.day-end",
+                            Href = "/dashboard/sales/day-end",
+                            Label = "Day End",
+                            NavItemId = 13,
+                            SortOrder = 4,
+                            Status = "Active"
+                        },
+                        new
+                        {
+                            SubNavItemId = 30,
+                            Code = "procurement.vendors",
+                            Href = "/dashboard/vendors",
+                            Label = "Vendors",
+                            NavItemId = 4,
+                            SortOrder = 0,
+                            Status = "Active"
+                        },
+                        new
                        {
                            SubNavItemId = 17,
                            Code = "procurement.requisitions",
@@ -5612,6 +5825,86 @@ namespace ERPCore.Migrations
                            NavItemId = 14,
                            SortOrder = 3,
                            Status = "Active"
+                        },
+                        new
+                        {
+                            SubNavItemId = 31,
+                            Code = "stock.ledger",
+                            Href = "/dashboard/stock/ledger",
+                            Label = "Stock Ledger",
+                            NavItemId = 6,
+                            SortOrder = 1,
+                            Status = "Active"
+                        },
+                        new
+                        {
+                            SubNavItemId = 32,
+                            Code = "stock.enquiry",
+                            Href = "/dashboard/stock/enquiry",
+                            Label = "Stock Enquiry",
+                            NavItemId = 6,
+                            SortOrder = 2,
+                            Status = "Active"
+                        },
+                        new
+                        {
+                            SubNavItemId = 33,
+                            Code = "stock.valuation",
+                            Href = "/dashboard/stock/valuation",
+                            Label = "Valuation",
+                            NavItemId = 6,
+                            SortOrder = 3,
+                            Status = "Active"
+                        },
+                        new
+                        {
+                            SubNavItemId = 34,
+                            Code = "stock.transfers",
+                            Href = "/dashboard/stock/transfers",
+                            Label = "Transfers",
+                            NavItemId = 6,
+                            SortOrder = 4,
+                            Status = "Active"
+                        },
+                        new
+                        {
+                            SubNavItemId = 35,
+                            Code = "stock.adjustments",
+                            Href = "/dashboard/stock/adjustments",
+                            Label = "Adjustments",
+                            NavItemId = 6,
+                            SortOrder = 5,
+                            Status = "Active"
+                        },
+                        new
+                        {
+                            SubNavItemId = 36,
+                            Code = "stock.counts",
+                            Href = "/dashboard/stock/counts",
+                            Label = "Counts",
+                            NavItemId = 6,
+                            SortOrder = 6,
+                            Status = "Active"
+                        },
+                        new
+                        {
+                            SubNavItemId = 37,
+                            Code = "stock.reorder-alerts",
+                            Href = "/dashboard/stock/reorder-alerts",
+                            Label = "Reorder Alerts",
+                            NavItemId = 6,
+                            SortOrder = 7,
+                            Status = "Active"
+                        },
+                        new
+                        {
+                            SubNavItemId = 38,
+                            Code = "stock.wastage",
+                            Href = "/dashboard/stock/wastage",
+                            Label = "Wastage",
+                            NavItemId = 6,
+                            SortOrder = 8,
+                            Status = "Active"
                        });
                });

@@ -5906,6 +6199,9 @@ namespace ERPCore.Migrations

                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("WarehouseId"));

+                    b.Property<int>("BranchId")
+                        .HasColumnType("integer");
+
                    b.Property<string>("Code")
                        .IsRequired()
                        .HasMaxLength(50)
@@ -5918,6 +6214,8 @@ namespace ERPCore.Migrations

                    b.HasKey("WarehouseId");

+                    b.HasIndex("BranchId");
+
                    b.HasIndex("Code")
                        .IsUnique();

@@ -6053,6 +6351,16 @@ namespace ERPCore.Migrations
                    b.Navigation("Warehouse");
                });

+            modelBuilder.Entity("ERPCore.Domain.Entities.BranchConfig", b =>
+                {
+                    b.HasOne("ERPCore.Domain.Entities.User", "UpdatedByUser")
+                        .WithMany()
+                        .HasForeignKey("UpdatedBy")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.Navigation("UpdatedByUser");
+                });
+
            modelBuilder.Entity("ERPCore.Domain.Entities.BundleSale", b =>
                {
                    b.HasOne("ERPCore.Domain.Entities.BundleSaleTemplate", "BundleSaleTemplate")
@@ -6188,7 +6496,8 @@ namespace ERPCore.Migrations
                    b.HasOne("ERPCore.Domain.Entities.Branch", "Branch")
                        .WithMany()
                        .HasForeignKey("BranchId")
-                        .OnDelete(DeleteBehavior.Restrict);
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();

                    b.HasOne("ERPCore.Domain.Entities.Department", "Department")
                        .WithMany()
@@ -6312,6 +6621,12 @@ namespace ERPCore.Migrations

            modelBuilder.Entity("ERPCore.Domain.Entities.Grn", b =>
                {
+                    b.HasOne("ERPCore.Domain.Entities.Branch", "Branch")
+                        .WithMany()
+                        .HasForeignKey("BranchId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
                        .WithMany()
                        .HasForeignKey("CreatedBy")
@@ -6340,6 +6655,8 @@ namespace ERPCore.Migrations
                        .OnDelete(DeleteBehavior.Restrict)
                        .IsRequired();

+                    b.Navigation("Branch");
+
                    b.Navigation("Creator");

                    b.Navigation("PurchaseInvoice");
@@ -6517,6 +6834,17 @@ namespace ERPCore.Migrations
                    b.Navigation("PayrollRun");
                });

+            modelBuilder.Entity("ERPCore.Domain.Entities.LoginActivity", b =>
+                {
+                    b.HasOne("ERPCore.Domain.Entities.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
            modelBuilder.Entity("ERPCore.Domain.Entities.NotificationConfig", b =>
                {
                    b.HasOne("ERPCore.Domain.Entities.User", "UpdatedByUser")
@@ -7074,6 +7402,12 @@ namespace ERPCore.Migrations

            modelBuilder.Entity("ERPCore.Domain.Entities.SalesInvoice", b =>
                {
+                    b.HasOne("ERPCore.Domain.Entities.Branch", "Branch")
+                        .WithMany()
+                        .HasForeignKey("BranchId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
                        .WithMany()
                        .HasForeignKey("CreatorUserId");
@@ -7090,6 +7424,8 @@ namespace ERPCore.Migrations
                        .OnDelete(DeleteBehavior.Restrict)
                        .IsRequired();

+                    b.Navigation("Branch");
+
                    b.Navigation("Creator");

                    b.Navigation("Customer");
@@ -7355,6 +7691,12 @@ namespace ERPCore.Migrations

            modelBuilder.Entity("ERPCore.Domain.Entities.StockAdjustment", b =>
                {
+                    b.HasOne("ERPCore.Domain.Entities.Branch", "Branch")
+                        .WithMany()
+                        .HasForeignKey("BranchId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
                        .WithMany()
                        .HasForeignKey("CreatedBy")
@@ -7373,6 +7715,8 @@ namespace ERPCore.Migrations
                        .OnDelete(DeleteBehavior.Restrict)
                        .IsRequired();

+                    b.Navigation("Branch");
+
                    b.Navigation("Creator");

                    b.Navigation("ReasonCode");
@@ -7416,6 +7760,12 @@ namespace ERPCore.Migrations

            modelBuilder.Entity("ERPCore.Domain.Entities.StockCount", b =>
                {
+                    b.HasOne("ERPCore.Domain.Entities.Branch", "Branch")
+                        .WithMany()
+                        .HasForeignKey("BranchId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
                        .WithMany()
                        .HasForeignKey("CreatedBy")
@@ -7428,6 +7778,8 @@ namespace ERPCore.Migrations
                        .OnDelete(DeleteBehavior.Restrict)
                        .IsRequired();

+                    b.Navigation("Branch");
+
                    b.Navigation("Creator");

                    b.Navigation("Warehouse");
@@ -7535,6 +7887,12 @@ namespace ERPCore.Migrations

            modelBuilder.Entity("ERPCore.Domain.Entities.StockTransfer", b =>
                {
+                    b.HasOne("ERPCore.Domain.Entities.Branch", "Branch")
+                        .WithMany()
+                        .HasForeignKey("BranchId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
                        .WithMany()
                        .HasForeignKey("CreatedBy")
@@ -7553,6 +7911,8 @@ namespace ERPCore.Migrations
                        .OnDelete(DeleteBehavior.Restrict)
                        .IsRequired();

+                    b.Navigation("Branch");
+
                    b.Navigation("Creator");

                    b.Navigation("DestWarehouse");
@@ -7680,6 +8040,17 @@ namespace ERPCore.Migrations
                    b.Navigation("Quotation");
                });

+            modelBuilder.Entity("ERPCore.Domain.Entities.Warehouse", b =>
+                {
+                    b.HasOne("ERPCore.Domain.Entities.Branch", "Branch")
+                        .WithMany()
+                        .HasForeignKey("BranchId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Branch");
+                });
+
            modelBuilder.Entity("ERPCore.Domain.Entities.BundleSale", b =>
                {
                    b.Navigation("Lines");
@@ -85,6 +85,8 @@ builder.Services.AddScoped<IBrandService, BrandService>();
 builder.Services.AddScoped<IItemTypeService, ItemTypeService>();
 //builder.Services.AddScoped<ICompanyProfileService, CompanyProfileService>();
 builder.Services.AddScoped<IProductConfigService, ProductConfigService>();
+builder.Services.AddScoped<IBranchConfigService, BranchConfigService>();
+builder.Services.AddScoped<IBranchAccessService, BranchAccessService>();
 builder.Services.AddSingleton<INotificationModuleCatalog, NotificationModuleCatalog>();
 builder.Services.AddScoped<INotificationConfigService, NotificationConfigService>();
 builder.Services.AddScoped<IVendorService, VendorService>();
@@ -6,7 +6,7 @@
      "dotnetRunMessages": true,
      "launchBrowser": true,
      "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5224",
+      "applicationUrl": "http://localhost:6701",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
@@ -16,7 +16,7 @@
      "dotnetRunMessages": true,
      "launchBrowser": true,
      "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:7112;http://localhost:5224",
+      "applicationUrl": "https://localhost:7112;http://localhost:6701",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
@@ -32,6 +32,7 @@ public sealed class AdjustmentService : IAdjustmentService
    private readonly IStockMutator _mutator;
    private readonly INumberSequenceService _numbers;
    private readonly ICurrentUser _currentUser;
+    private readonly IBranchConfigService _branchConfig;
    private readonly IUnitOfWork _uow;
    private readonly IGeneralLedgerService _gl;
    private readonly string _glInventoryAccountCode;
@@ -41,7 +42,7 @@ public sealed class AdjustmentService : IAdjustmentService
    public AdjustmentService(
        IRepository<StockAdjustment> adjustments, IRepository<Warehouse> warehouses, IRepository<Item> items,
        IRepository<ReasonCode> reasonCodes, IRepository<StockLedger> ledger, IStockMutator mutator,
-        INumberSequenceService numbers, ICurrentUser currentUser, IUnitOfWork uow,
+        INumberSequenceService numbers, ICurrentUser currentUser, IBranchConfigService branchConfig, IUnitOfWork uow,
        IGeneralLedgerService gl, IConfiguration configuration)
    {
        _adjustments = adjustments;
@@ -52,6 +53,7 @@ public sealed class AdjustmentService : IAdjustmentService
        _mutator = mutator;
        _numbers = numbers;
        _currentUser = currentUser;
+        _branchConfig = branchConfig;
        _uow = uow;
        _gl = gl;
        _glInventoryAccountCode = configuration["Adjustment:GlInventoryAccountCode"] ?? string.Empty;
@@ -95,7 +97,7 @@ public sealed class AdjustmentService : IAdjustmentService
    }

    public async Task<PagedResponse<AdjustmentSummaryDto>> ListAsync(
-        PageQuery query, int? warehouseId, int? reasonCodeId, CancellationToken ct = default)
+        PageQuery query, int? warehouseId, int? branchId, int? reasonCodeId, CancellationToken ct = default)
    {
        var q = _adjustments.Query().AsNoTracking();

@@ -105,13 +107,15 @@ public sealed class AdjustmentService : IAdjustmentService
            q = q.Where(a => EF.Functions.ILike(a.DocNo, $"%{term}%"));
        }
        if (warehouseId is not null) q = q.Where(a => a.WarehouseId == warehouseId);
+        // Warehouses are shared across branches — the adjustment carries its own owning BranchId.
+        if (branchId is not null) q = q.Where(a => a.BranchId == branchId);
        if (reasonCodeId is not null) q = q.Where(a => a.ReasonCodeId == reasonCodeId);

        var total = await q.CountAsync(ct);
        var rows = await q.OrderByDescending(a => a.AdjustmentId)
            .Skip(query.Skip).Take(query.PageSize)
            .Select(a => new AdjustmentSummaryDto(
-                a.AdjustmentId, a.DocNo, a.WarehouseId, a.ReasonCodeId, a.Status,
+                a.AdjustmentId, a.DocNo, a.WarehouseId, a.BranchId, a.ReasonCodeId, a.Status,
                a.CreatedBy, a.CreatedAt, a.Lines.Count, a.GlJournalNo))
            .ToListAsync(ct);

@@ -144,6 +148,8 @@ public sealed class AdjustmentService : IAdjustmentService
        if (!await _warehouses.Query().AnyAsync(w => w.WarehouseId == request.WarehouseId, ct))
            throw new DomainException(ErrorCodes.Validation, $"Warehouse {request.WarehouseId} does not exist.", 422);

+        var branchId = await _branchConfig.ResolveBranchIdAsync(request.BranchId, ct);
+
        var reason = await _reasonCodes.Query().AsNoTracking().FirstOrDefaultAsync(r => r.ReasonCodeId == request.ReasonCodeId, ct)
            ?? throw new DomainException(ErrorCodes.Validation, $"Reason code {request.ReasonCodeId} does not exist.", 422);
        if (reason.Context != ReasonContext.Adjustment)
@@ -168,6 +174,7 @@ public sealed class AdjustmentService : IAdjustmentService
            {
                DocNo = docNo,
                WarehouseId = request.WarehouseId,
+                BranchId = branchId,
                ReasonCodeId = request.ReasonCodeId.Value,
                Status = AdjustmentStatus.Posted,
                CreatedBy = _currentUser.AuditUserId,
@@ -195,7 +202,7 @@ public sealed class AdjustmentService : IAdjustmentService
    }

    private static AdjustmentDto ToDto(StockAdjustment a, IReadOnlyList<int> ledgerRefs) => new(
-        a.AdjustmentId, a.DocNo, a.WarehouseId, a.ReasonCodeId, a.Status, a.CreatedBy, a.CreatedAt,
+        a.AdjustmentId, a.DocNo, a.WarehouseId, a.BranchId, a.ReasonCodeId, a.Status, a.CreatedBy, a.CreatedAt,
        a.GlJournalNo, a.GlPostedAt,
        a.Lines.OrderBy(l => l.AdjLineId)
            .Select(l => new AdjustmentLineDto(l.AdjLineId, l.ItemId, l.BinId, l.BatchId, l.QtyDelta)).ToList(),
@@ -1,7 +1,10 @@
 using System.Text.Json;
 using ERPCore.Domain.Entities;
+using ERPCore.Domain.Enums;
 using ERPCore.Dtos.Audit;
 using ERPCore.Dtos.Common;
+using ERPCore.Infra.Auth;
+using ERPCore.Infra.UoW;
 using ERPCore.Repositories.Interfaces;
 using ERPCore.Services.Interfaces;
 using Microsoft.EntityFrameworkCore;
@@ -12,11 +15,19 @@ public sealed class AuditService : IAuditService
 {
    private readonly IRepository<AuditLog> _logs;
    private readonly IRepository<JournalEntryStub> _journal;
+    private readonly IRepository<User> _users;
+    private readonly IRepository<LoginActivity> _loginActivities;
+    private readonly IUnitOfWork _uow;

-    public AuditService(IRepository<AuditLog> logs, IRepository<JournalEntryStub> journal)
+    public AuditService(
+        IRepository<AuditLog> logs, IRepository<JournalEntryStub> journal, IRepository<User> users,
+        IRepository<LoginActivity> loginActivities, IUnitOfWork uow)
    {
        _logs = logs;
        _journal = journal;
+        _users = users;
+        _loginActivities = loginActivities;
+        _uow = uow;
    }

    public async Task<PagedResponse<AuditLogDto>> ListLogsAsync(
@@ -55,4 +66,48 @@ public sealed class AuditService : IAuditService

        return PagedResponse<JournalEntryStubDto>.Create(rows, query.Page, query.PageSize, total);
    }
+
+    public async Task RecordLoginAsync(Guid authUserId, string? ipAddress, string? userAgent, CancellationToken ct = default)
+    {
+        var userId = await _users.Query().AsNoTracking()
+            .Where(u => u.AuthUserId == authUserId)
+            .Select(u => (int?)u.UserId)
+            .FirstOrDefaultAsync(ct);
+        // JIT provisioning may not have created the local shadow row yet on a brand-new
+        // account's very first login — nothing to attach the log to in that case.
+        if (userId is null) return;
+
+        var now = DateTime.UtcNow;
+        await _logs.AddAsync(new AuditLog
+        {
+            UserId = userId.Value,
+            EntityType = "User",
+            EntityId = userId.Value,
+            Action = AuditAction.Login,
+            ChangeSet = "{}",
+            CreatedAt = now
+        }, ct);
+        await _loginActivities.AddAsync(new LoginActivity
+        {
+            UserId = userId.Value,
+            IpAddress = ipAddress,
+            UserAgent = userAgent,
+            DeviceLabel = UserAgentLabeler.Label(userAgent),
+            LoginAt = now
+        }, ct);
+        await _uow.SaveChangesAsync(ct);
+    }
+
+    public async Task<PagedResponse<LoginActivityDto>> ListLoginDevicesAsync(int userId, PageQuery query, CancellationToken ct = default)
+    {
+        var q = _loginActivities.Query().AsNoTracking().Where(l => l.UserId == userId);
+
+        var total = await q.CountAsync(ct);
+        var rows = await q.OrderByDescending(l => l.LoginActivityId)
+            .Skip(query.Skip).Take(query.PageSize)
+            .Select(l => new LoginActivityDto(l.LoginActivityId, l.IpAddress, l.DeviceLabel, l.LoginAt))
+            .ToListAsync(ct);
+
+        return PagedResponse<LoginActivityDto>.Create(rows, query.Page, query.PageSize, total);
+    }
 }
@@ -0,0 +1,36 @@
+using ERPCore.Domain.Entities;
+using ERPCore.Infra.Auth;
+using ERPCore.Repositories.Interfaces;
+using ERPCore.Services.Interfaces;
+using ERPCore.System.Errors;
+using Microsoft.EntityFrameworkCore;
+
+namespace ERPCore.Services;
+
+public sealed class BranchAccessService : IBranchAccessService
+{
+    private readonly ICurrentUser _currentUser;
+    private readonly IRepository<Employee> _employees;
+    private readonly IBranchConfigService _branchConfig;
+
+    public BranchAccessService(ICurrentUser currentUser, IRepository<Employee> employees, IBranchConfigService branchConfig)
+    {
+        _currentUser = currentUser;
+        _employees = employees;
+        _branchConfig = branchConfig;
+    }
+
+    public async Task EnsureBranchVisibleAsync(int branchId, CancellationToken ct = default)
+    {
+        if (!_currentUser.IsAuthenticated || _currentUser.IsAdmin) return;
+        if (!await _branchConfig.IsBranchingEnabledAsync(ct)) return;
+
+        var ownBranchId = await _employees.Query().AsNoTracking()
+            .Where(e => e.UserId == _currentUser.AuditUserId)
+            .Select(e => (int?)e.BranchId)
+            .FirstOrDefaultAsync(ct);
+
+        if (ownBranchId is null || ownBranchId != branchId)
+            throw new NotFoundException("The requested record was not found.");
+    }
+}
@@ -0,0 +1,103 @@
+using ERPCore.Common.Http;
+using ERPCore.Domain.Entities;
+using ERPCore.Domain.Enums;
+using ERPCore.Dtos.Config;
+using ERPCore.Infra.Auth;
+using ERPCore.Infra.UoW;
+using ERPCore.Repositories.Interfaces;
+using ERPCore.Services.Interfaces;
+using ERPCore.System.Errors;
+using Microsoft.EntityFrameworkCore;
+
+namespace ERPCore.Services;
+
+/// <summary>
+/// Branch configuration service over the singleton row seeded by DataSeeder. Also owns
+/// resolving the effective branch id for an Employee/Warehouse write — the one place that
+/// knows how to fall back to a default branch when branching is switched off.
+/// </summary>
+public sealed class BranchConfigService : IBranchConfigService
+{
+    private const string DefaultBranchCode = "BR-000";
+    private const string DefaultBranchName = "Main Branch";
+
+    private readonly IRepository<BranchConfig> _config;
+    private readonly IRepository<Branch> _branches;
+    private readonly ICurrentUser _currentUser;
+    private readonly IUnitOfWork _uow;
+
+    public BranchConfigService(IRepository<BranchConfig> config, IRepository<Branch> branches, ICurrentUser currentUser, IUnitOfWork uow)
+    {
+        _config = config;
+        _branches = branches;
+        _currentUser = currentUser;
+        _uow = uow;
+    }
+
+    public async Task<ETagged<BranchConfigDto>> GetAsync(CancellationToken ct = default)
+    {
+        var config = await _config.Query().AsNoTracking()
+            .FirstOrDefaultAsync(c => c.ConfigId == BranchConfig.SingletonId, ct)
+            ?? throw new NotFoundException("Branch configuration has not been seeded.");
+
+        return new ETagged<BranchConfigDto>(Map(config), config.RowVersion);
+    }
+
+    public async Task<ETagged<BranchConfigDto>> UpdateAsync(
+        UpdateBranchConfigRequest request, uint expectedRowVersion, CancellationToken ct = default)
+    {
+        var config = await _config.GetByIdAsync(BranchConfig.SingletonId, ct)
+            ?? throw new NotFoundException("Branch configuration has not been seeded.");
+
+        if (config.RowVersion != expectedRowVersion)
+            throw new DomainException(ErrorCodes.ConcurrencyConflict, "The configuration was modified by another request.", 412);
+
+        config.BranchingEnabled = request.BranchingEnabled!.Value;
+        config.UpdatedAt = DateTime.UtcNow;
+        config.UpdatedBy = _currentUser.AuditUserId;
+
+        try
+        {
+            await _uow.SaveChangesAsync(ct);
+        }
+        catch (DbUpdateConcurrencyException)
+        {
+            throw new DomainException(ErrorCodes.ConcurrencyConflict, "The configuration was modified by another request.", 412);
+        }
+
+        return new ETagged<BranchConfigDto>(Map(config), config.RowVersion);
+    }
+
+    public async Task<bool> IsBranchingEnabledAsync(CancellationToken ct = default)
+    {
+        var config = await _config.Query().AsNoTracking()
+            .FirstOrDefaultAsync(c => c.ConfigId == BranchConfig.SingletonId, ct);
+        // Seeded at startup (DataSeeder) — missing only for a database built some other way,
+        // in which case the safer default is "on" (today's mandatory behaviour), not silently off.
+        return config?.BranchingEnabled ?? true;
+    }
+
+    public async Task<int> ResolveBranchIdAsync(int requestedBranchId, CancellationToken ct = default)
+    {
+        if (await IsBranchingEnabledAsync(ct))
+        {
+            if (requestedBranchId <= 0)
+                throw new DomainException(ErrorCodes.Validation, "Branch is required.", 422);
+            return requestedBranchId;
+        }
+
+        // Branching is off — ignore whatever was posted and use the deployment's one default
+        // branch, creating it on first use (same placeholder MakeEmployeeBranchRequired/
+        // AddWarehouseBranch backfill onto for pre-existing rows).
+        var existingId = await _branches.Query().AsNoTracking()
+            .Where(b => b.Code == DefaultBranchCode).Select(b => b.BranchId).FirstOrDefaultAsync(ct);
+        if (existingId != 0) return existingId;
+
+        var branch = new Branch { Code = DefaultBranchCode, Name = DefaultBranchName, Status = EntityStatus.Active, CreatedAt = DateTime.UtcNow };
+        await _branches.AddAsync(branch, ct);
+        await _uow.SaveChangesAsync(ct);
+        return branch.BranchId;
+    }
+
+    private static BranchConfigDto Map(BranchConfig c) => new(c.BranchingEnabled, c.UpdatedAt, c.UpdatedBy);
+}
@@ -34,6 +34,7 @@ public sealed class CountService : ICountService
    private readonly IStockMutator _mutator;
    private readonly INumberSequenceService _numbers;
    private readonly ICurrentUser _currentUser;
+    private readonly IBranchConfigService _branchConfig;
    private readonly IUnitOfWork _uow;
    private readonly IGeneralLedgerService _gl;
    private readonly string _glInventoryAccountCode;
@@ -43,7 +44,7 @@ public sealed class CountService : ICountService
    public CountService(
        IRepository<StockCount> counts, IRepository<StockAdjustment> adjustments, IRepository<Warehouse> warehouses,
        IRepository<Item> items, IRepository<ReasonCode> reasonCodes, IFifoCostingService fifo, IStockMutator mutator,
-        INumberSequenceService numbers, ICurrentUser currentUser, IUnitOfWork uow,
+        INumberSequenceService numbers, ICurrentUser currentUser, IBranchConfigService branchConfig, IUnitOfWork uow,
        IGeneralLedgerService gl, IConfiguration configuration)
    {
        _counts = counts;
@@ -55,6 +56,7 @@ public sealed class CountService : ICountService
        _mutator = mutator;
        _numbers = numbers;
        _currentUser = currentUser;
+        _branchConfig = branchConfig;
        _uow = uow;
        _gl = gl;
        _glInventoryAccountCode = configuration["Adjustment:GlInventoryAccountCode"] ?? string.Empty;
@@ -97,7 +99,7 @@ public sealed class CountService : ICountService
    }

    public async Task<PagedResponse<CountSummaryDto>> ListAsync(
-        PageQuery query, CountStatus? status, int? warehouseId, CancellationToken ct = default)
+        PageQuery query, CountStatus? status, int? warehouseId, int? branchId, CancellationToken ct = default)
    {
        var q = _counts.Query().AsNoTracking();

@@ -108,12 +110,14 @@ public sealed class CountService : ICountService
        }
        if (status is not null) q = q.Where(c => c.Status == status);
        if (warehouseId is not null) q = q.Where(c => c.WarehouseId == warehouseId);
+        // Warehouses are shared across branches — the count carries its own owning BranchId.
+        if (branchId is not null) q = q.Where(c => c.BranchId == branchId);

        var total = await q.CountAsync(ct);
        var rows = await q.OrderByDescending(c => c.CountId)
            .Skip(query.Skip).Take(query.PageSize)
            .Select(c => new CountSummaryDto(
-                c.CountId, c.DocNo, c.WarehouseId, c.CountType, c.Status,
+                c.CountId, c.DocNo, c.WarehouseId, c.BranchId, c.CountType, c.Status,
                c.CreatedBy, c.CreatedAt, c.Lines.Count))
            .ToListAsync(ct);

@@ -132,6 +136,8 @@ public sealed class CountService : ICountService
        if (!await _warehouses.Query().AnyAsync(w => w.WarehouseId == request.WarehouseId, ct))
            throw new DomainException(ErrorCodes.Validation, $"Warehouse {request.WarehouseId} does not exist.", 422);

+        var branchId = await _branchConfig.ResolveBranchIdAsync(request.BranchId, ct);
+
        var itemIds = request.ItemIds.Distinct().ToList();
        foreach (var id in itemIds)
            if (!await _items.Query().AnyAsync(i => i.ItemId == id, ct))
@@ -152,6 +158,7 @@ public sealed class CountService : ICountService
            {
                DocNo = docNo,
                WarehouseId = request.WarehouseId,
+                BranchId = branchId,
                CountType = request.CountType,
                Status = CountStatus.Draft,
                CreatedBy = _currentUser.AuditUserId,
@@ -221,6 +228,7 @@ public sealed class CountService : ICountService
            {
                DocNo = docNo,
                WarehouseId = count.WarehouseId,
+                BranchId = count.BranchId,
                ReasonCodeId = reason.ReasonCodeId,
                Status = AdjustmentStatus.Posted,
                CreatedBy = _currentUser.AuditUserId,
@@ -249,7 +257,7 @@ public sealed class CountService : ICountService
    }

    private static CountDto Map(StockCount c) => new(
-        c.CountId, c.DocNo, c.WarehouseId, c.CountType, c.Status, c.CreatedBy, c.CreatedAt,
+        c.CountId, c.DocNo, c.WarehouseId, c.BranchId, c.CountType, c.Status, c.CreatedBy, c.CreatedAt,
        c.Lines.OrderBy(l => l.CountLineId)
            .Select(l => new CountLineDto(l.CountLineId, l.ItemId, l.BinId, l.SystemQty, l.CountedQty, l.Variance)).ToList());
 }
@@ -40,18 +40,19 @@ public sealed class DashboardService : IDashboardService
        _reorder = reorder;
    }

-    public async Task<DashboardStatsDto> GetStatsAsync(CancellationToken ct = default)
+    public async Task<DashboardStatsDto> GetStatsAsync(int? branchId, CancellationToken ct = default)
    {
        // Sequential, not Task.WhenAll: these repositories share one scoped DbContext,
        // which cannot run concurrent operations.
-        var onHandTotal = await _layers.Query().AsNoTracking().SumAsync(l => (decimal?)l.QtyRemaining, ct) ?? 0m;
-        var onHandWarehouses = await _layers.Query().AsNoTracking()
-            .Select(l => l.WarehouseId).Distinct().CountAsync(ct);
-        var stockValuationTotal = await _layers.Query().AsNoTracking()
-            .SumAsync(l => (decimal?)(l.QtyRemaining * l.UnitCost), ct) ?? 0m;
+        var layers = _layers.Query().AsNoTracking();
+        if (branchId is not null) layers = layers.Where(l => l.Warehouse!.BranchId == branchId);
+
+        var onHandTotal = await layers.SumAsync(l => (decimal?)l.QtyRemaining, ct) ?? 0m;
+        var onHandWarehouses = await layers.Select(l => l.WarehouseId).Distinct().CountAsync(ct);
+        var stockValuationTotal = await layers.SumAsync(l => (decimal?)(l.QtyRemaining * l.UnitCost), ct) ?? 0m;
        // EF can't translate constructing WarehouseValuationDto directly inside the GroupBy
        // Select — project to an anonymous type first, then materialize into the record.
-        var stockValuationByWarehouseRaw = await _layers.Query().AsNoTracking()
+        var stockValuationByWarehouseRaw = await layers
            .GroupBy(l => l.WarehouseId)
            .Select(g => new { WarehouseId = g.Key, Total = g.Sum(x => x.QtyRemaining * x.UnitCost) })
            .OrderByDescending(w => w.Total)
@@ -59,17 +60,26 @@ public sealed class DashboardService : IDashboardService
        var stockValuationByWarehouse = stockValuationByWarehouseRaw
            .Select(w => new WarehouseValuationDto(w.WarehouseId, w.Total))
            .ToList();
-        var pendingGrns = await _grns.Query().AsNoTracking().CountAsync(g => g.Status == GrnStatus.Draft, ct);
+
+        var grns = _grns.Query().AsNoTracking();
+        if (branchId is not null) grns = grns.Where(g => g.BranchId == branchId);
+        var pendingGrns = await grns.CountAsync(g => g.Status == GrnStatus.Draft, ct);
+
+        var counts = _counts.Query().AsNoTracking();
+        if (branchId is not null) counts = counts.Where(c => c.BranchId == branchId);
+        var pendingCounts = await counts.CountAsync(c => c.Status == CountStatus.Counted, ct);
+
+        // PurchaseOrder/Requisition/Rfq carry no warehouse/branch at header level yet
+        // (docs/BRANCH_ISOLATION_PLAN.md classifies them as needing a new BranchId column,
+        // not yet added) — these three stay global regardless of the selected branch.
        var pendingApprovalPOs = await _pos.Query().AsNoTracking()
            .CountAsync(p => p.Status == PurchaseOrderStatus.PendingApproval, ct);
        var openRequisitions = await _requisitions.Query().AsNoTracking()
            .CountAsync(r => r.Status == RequisitionStatus.Submitted, ct);
-        var pendingCounts = await _counts.Query().AsNoTracking()
-            .CountAsync(c => c.Status == CountStatus.Counted, ct);
        var openRfqs = await _rfqs.Query().AsNoTracking().CountAsync(r => r.Status == RfqStatus.Open, ct);

        // PageSize:1 is enough — GetAlertsAsync computes the full alert count before paging.
-        var lowStockAlerts = (await _reorder.GetAlertsAsync(null, new PageQuery { Page = 1, PageSize = 1 }, ct))
+        var lowStockAlerts = (await _reorder.GetAlertsAsync(null, branchId, new PageQuery { Page = 1, PageSize = 1 }, ct))
            .Pagination.TotalItems;

        return new DashboardStatsDto(
@@ -38,6 +38,7 @@ public sealed class GrnService : IGrnService
    private readonly IFifoCostingService _fifo;
    private readonly INumberSequenceService _numbers;
    private readonly ICurrentUser _currentUser;
+    private readonly IBranchConfigService _branchConfig;
    private readonly IUnitOfWork _uow;
    private readonly IGeneralLedgerService _gl;
    private readonly string _glInventoryAccountCode;
@@ -49,8 +50,8 @@ public sealed class GrnService : IGrnService
        IRepository<Item> items, IRepository<Warehouse> warehouses,
        IRepository<Bin> bins, IRepository<Vendor> vendors, IRepository<Batch> batches,
        IRepository<StockLayer> layers, IRepository<StockLedger> ledger,
-        IFifoCostingService fifo, INumberSequenceService numbers, ICurrentUser currentUser, IUnitOfWork uow,
-        IGeneralLedgerService gl, IConfiguration configuration)
+        IFifoCostingService fifo, INumberSequenceService numbers, ICurrentUser currentUser, IBranchConfigService branchConfig,
+        IUnitOfWork uow, IGeneralLedgerService gl, IConfiguration configuration)
    {
        _grns = grns;
        _pos = pos;
@@ -65,6 +66,7 @@ public sealed class GrnService : IGrnService
        _fifo = fifo;
        _numbers = numbers;
        _currentUser = currentUser;
+        _branchConfig = branchConfig;
        _uow = uow;
        _gl = gl;
        _glInventoryAccountCode = configuration["Grn:GlInventoryAccountCode"] ?? string.Empty;
@@ -73,7 +75,7 @@ public sealed class GrnService : IGrnService
    }

    public async Task<PagedResponse<GrnSummaryDto>> ListAsync(
-        PageQuery query, GrnStatus? status, int? poId, int? vendorId, int? warehouseId, CancellationToken ct = default)
+        PageQuery query, GrnStatus? status, int? poId, int? vendorId, int? warehouseId, int? branchId, CancellationToken ct = default)
    {
        var q = _grns.Query().AsNoTracking();

@@ -86,12 +88,14 @@ public sealed class GrnService : IGrnService
        if (poId is not null) q = q.Where(g => g.PoId == poId);
        if (vendorId is not null) q = q.Where(g => g.VendorId == vendorId);
        if (warehouseId is not null) q = q.Where(g => g.WarehouseId == warehouseId);
+        // Warehouses are shared across branches — GRN carries its own BranchId, set at creation.
+        if (branchId is not null) q = q.Where(g => g.BranchId == branchId);

        var total = await q.CountAsync(ct);
        var rows = await q.OrderByDescending(g => g.GrnId)
            .Skip(query.Skip).Take(query.PageSize)
            .Select(g => new GrnSummaryDto(
-                g.GrnId, g.DocNo, g.PoId, g.VendorId, g.WarehouseId, g.Status,
+                g.GrnId, g.DocNo, g.PoId, g.VendorId, g.WarehouseId, g.BranchId, g.Status,
                g.CreatedBy, g.CreatedAt, g.PostedAt, g.Lines.Count,
                g.PurchaseInvoiceId, g.PurchaseInvoice != null ? g.PurchaseInvoice.DocNo : null))
            .ToListAsync(ct);
@@ -113,6 +117,8 @@ public sealed class GrnService : IGrnService
        if (!await _warehouses.Query().AnyAsync(w => w.WarehouseId == request.WarehouseId, ct))
            throw new DomainException(ErrorCodes.Validation, $"Warehouse {request.WarehouseId} does not exist.", 422);

+        var branchId = await _branchConfig.ResolveBranchIdAsync(request.BranchId, ct);
+
        // Resolve vendor + PO context.
        PurchaseOrder? po = null;
        int vendorId;
@@ -208,6 +214,7 @@ public sealed class GrnService : IGrnService
                PoId = request.PoId,
                VendorId = vendorId,
                WarehouseId = request.WarehouseId,
+                BranchId = branchId,
                Status = GrnStatus.Draft,
                CreatedBy = _currentUser.AuditUserId,
                CreatedAt = DateTime.UtcNow,
@@ -445,7 +452,7 @@ public sealed class GrnService : IGrnService
        l.LayerId, l.ItemId, l.WarehouseId, l.BatchId, l.QtyReceived, l.QtyRemaining, l.UnitCost, l.ReceiptDate);

    private static GrnDto Map(Grn g) => new(
-        g.GrnId, g.DocNo, g.PoId, g.VendorId, g.WarehouseId, g.Status, g.CreatedBy, g.CreatedAt, g.PostedAt,
+        g.GrnId, g.DocNo, g.PoId, g.VendorId, g.WarehouseId, g.BranchId, g.Status, g.CreatedBy, g.CreatedAt, g.PostedAt,
        g.GlJournalNo, g.PurchaseInvoiceId, g.PurchaseInvoice?.DocNo,
        g.Lines.OrderBy(l => l.GrnLineId).Select(l => new GrnLineDto(
            l.GrnLineId, l.PoLineId, l.ItemId, l.BinId, l.Qty, l.UnitCost, l.PoUnitPrice,
@@ -36,7 +36,7 @@ public sealed class BranchService : IBranchService
        var total = await q.CountAsync(ct);
        var rows = await q.OrderBy(b => b.Name)
            .Skip(query.Skip).Take(query.PageSize)
-            .Select(b => new BranchDto(b.BranchId, b.Code, b.Name, b.Address, b.Status, b.CreatedAt, b.UpdatedAt))
+            .Select(b => new BranchDto(b.BranchId, b.Code, b.Name, b.Address, b.PhoneNumber, b.Status, b.CreatedAt, b.UpdatedAt))
            .ToListAsync(ct);

        return PagedResponse<BranchDto>.Create(rows, query.Page, query.PageSize, total);
@@ -50,15 +50,12 @@ public sealed class BranchService : IBranchService

    public async Task<ETagged<BranchDto>> CreateAsync(CreateBranchRequest request, CancellationToken ct = default)
    {
-        var code = request.Code.Trim();
-        if (await _branches.Query().AnyAsync(b => b.Code.ToLower() == code.ToLower(), ct))
-            throw new ConflictException($"A branch with code '{code}' already exists.");
-
        var branch = new Branch
        {
-            Code = code,
+            Code = await GenerateCodeAsync(ct),
            Name = request.Name.Trim(),
            Address = request.Address?.Trim(),
+            PhoneNumber = request.PhoneNumber?.Trim(),
            Status = EntityStatus.Active,
            CreatedAt = DateTime.UtcNow
        };
@@ -69,6 +66,28 @@ public sealed class BranchService : IBranchService
        return new ETagged<BranchDto>(Map(branch), branch.RowVersion);
    }

+    private const string CodePrefix = "BR-";
+
+    /// <summary>
+    /// Next sequential branch code ("BR-001", "BR-002", ...) — codes are never user-entered.
+    /// Parses the numeric suffix of existing codes rather than trusting a row count, since a
+    /// deactivated-not-deleted branch never frees its slot and counts would drift.
+    /// </summary>
+    private async Task<string> GenerateCodeAsync(CancellationToken ct)
+    {
+        var existingCodes = await _branches.Query().AsNoTracking()
+            .Where(b => b.Code.StartsWith(CodePrefix))
+            .Select(b => b.Code)
+            .ToListAsync(ct);
+
+        var nextNumber = existingCodes
+            .Select(c => int.TryParse(c.AsSpan(CodePrefix.Length), out var n) ? n : 0)
+            .DefaultIfEmpty(0)
+            .Max() + 1;
+
+        return $"{CodePrefix}{nextNumber:D3}";
+    }
+
    public async Task<ETagged<BranchDto>> UpdateAsync(int branchId, UpdateBranchRequest request, uint expectedRowVersion, CancellationToken ct = default)
    {
        var branch = await _branches.GetByIdAsync(branchId, ct)
@@ -79,6 +98,7 @@ public sealed class BranchService : IBranchService

        branch.Name = request.Name.Trim();
        branch.Address = request.Address?.Trim();
+        branch.PhoneNumber = request.PhoneNumber?.Trim();
        branch.UpdatedAt = DateTime.UtcNow;

        try
@@ -103,5 +123,21 @@ public sealed class BranchService : IBranchService
        await _uow.SaveChangesAsync(ct);
    }

-    private static BranchDto Map(Branch b) => new(b.BranchId, b.Code, b.Name, b.Address, b.Status, b.CreatedAt, b.UpdatedAt);
+    public async Task DeleteAsync(int branchId, CancellationToken ct = default)
+    {
+        var branch = await _branches.GetByIdAsync(branchId, ct)
+            ?? throw new NotFoundException($"Branch {branchId} was not found.");
+
+        _branches.Remove(branch);
+        try
+        {
+            await _uow.SaveChangesAsync(ct);
+        }
+        catch (DbUpdateException)
+        {
+            throw new DomainException(ErrorCodes.MasterInUse, "This branch is referenced by other records and cannot be deleted.", 409);
+        }
+    }
+
+    private static BranchDto Map(Branch b) => new(b.BranchId, b.Code, b.Name, b.Address, b.PhoneNumber, b.Status, b.CreatedAt, b.UpdatedAt);
 }
@@ -127,6 +127,22 @@ public sealed class DepartmentService : IDepartmentService
        await _uow.SaveChangesAsync(ct);
    }

+    public async Task DeleteAsync(int departmentId, CancellationToken ct = default)
+    {
+        var dept = await _departments.GetByIdAsync(departmentId, ct)
+            ?? throw new NotFoundException($"Department {departmentId} was not found.");
+
+        _departments.Remove(dept);
+        try
+        {
+            await _uow.SaveChangesAsync(ct);
+        }
+        catch (DbUpdateException)
+        {
+            throw new DomainException(ErrorCodes.MasterInUse, "This department is referenced by other records (sub-departments or employees) and cannot be deleted.", 409);
+        }
+    }
+
    /// <summary>Walks up from <paramref name="newParentId"/>; throws if it ever reaches <paramref name="departmentId"/>.</summary>
    private async Task EnsureNoCycleAsync(int departmentId, int newParentId, CancellationToken ct)
    {
@@ -101,5 +101,21 @@ public sealed class DesignationService : IDesignationService
        await _uow.SaveChangesAsync(ct);
    }

+    public async Task DeleteAsync(int designationId, CancellationToken ct = default)
+    {
+        var designation = await _designations.GetByIdAsync(designationId, ct)
+            ?? throw new NotFoundException($"Designation {designationId} was not found.");
+
+        _designations.Remove(designation);
+        try
+        {
+            await _uow.SaveChangesAsync(ct);
+        }
+        catch (DbUpdateException)
+        {
+            throw new DomainException(ErrorCodes.MasterInUse, "This designation is referenced by other records and cannot be deleted.", 409);
+        }
+    }
+
    private static DesignationDto Map(Designation d) => new(d.DesignationId, d.Code, d.Name, d.Status, d.CreatedAt, d.UpdatedAt);
 }
@@ -3,6 +3,7 @@ using ERPCore.Domain.Entities;
 using ERPCore.Domain.Enums;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Hrm;
+using ERPCore.Infra.Storage;
 using ERPCore.Infra.UoW;
 using ERPCore.Repositories.Interfaces;
 using ERPCore.Services.Interfaces;
@@ -21,14 +22,33 @@ public sealed class EmployeeService : IEmployeeService
    private readonly IRepository<Employee> _employees;
    private readonly IRepository<User> _users;
    private readonly IRepository<EmployeeBankDetail> _bankDetails;
+    private readonly IRepository<EmployeeDocument> _documents;
+    private readonly IRepository<EmployeeSalaryStructure> _salaryStructures;
+    private readonly IRepository<EmployeeLoan> _loans;
+    private readonly IRepository<LeaveBalance> _leaveBalances;
+    private readonly IRepository<PayrollLine> _payrollLines;
+    private readonly IFileStorageService _fileStorage;
+    private readonly IBranchConfigService _branchConfig;
+    private readonly IBranchAccessService _branchAccess;
    private readonly IUnitOfWork _uow;

    public EmployeeService(
-        IRepository<Employee> employees, IRepository<User> users, IRepository<EmployeeBankDetail> bankDetails, IUnitOfWork uow)
+        IRepository<Employee> employees, IRepository<User> users, IRepository<EmployeeBankDetail> bankDetails,
+        IRepository<EmployeeDocument> documents, IRepository<EmployeeSalaryStructure> salaryStructures,
+        IRepository<EmployeeLoan> loans, IRepository<LeaveBalance> leaveBalances, IRepository<PayrollLine> payrollLines,
+        IFileStorageService fileStorage, IBranchConfigService branchConfig, IBranchAccessService branchAccess, IUnitOfWork uow)
    {
        _employees = employees;
        _users = users;
        _bankDetails = bankDetails;
+        _documents = documents;
+        _salaryStructures = salaryStructures;
+        _loans = loans;
+        _leaveBalances = leaveBalances;
+        _payrollLines = payrollLines;
+        _fileStorage = fileStorage;
+        _branchConfig = branchConfig;
+        _branchAccess = branchAccess;
        _uow = uow;
    }

@@ -66,7 +86,10 @@ public sealed class EmployeeService : IEmployeeService
    public async Task<ETagged<EmployeeDetailDto>?> GetAsync(int employeeId, CancellationToken ct = default)
    {
        var employee = await _employees.Query().AsNoTracking().FirstOrDefaultAsync(e => e.EmployeeId == employeeId, ct);
-        return employee is null ? null : new ETagged<EmployeeDetailDto>(Map(employee), employee.RowVersion);
+        if (employee is null) return null;
+
+        await _branchAccess.EnsureBranchVisibleAsync(employee.BranchId, ct);
+        return new ETagged<EmployeeDetailDto>(Map(employee), employee.RowVersion);
    }

    public async Task<ETagged<EmployeeDetailDto>> CreateAsync(CreateEmployeeRequest request, int actorUserId, CancellationToken ct = default)
@@ -85,6 +108,8 @@ public sealed class EmployeeService : IEmployeeService
            linkedUserId = user.UserId;
        }

+        var branchId = await _branchConfig.ResolveBranchIdAsync(request.BranchId, ct);
+
        var employee = new Employee
        {
            EmployeeCode = code,
@@ -107,7 +132,7 @@ public sealed class EmployeeService : IEmployeeService
            DepartmentId = request.DepartmentId,
            DesignationId = request.DesignationId,
            EmploymentTypeId = request.EmploymentTypeId,
-            BranchId = request.BranchId,
+            BranchId = branchId,
            WorkShiftId = request.WorkShiftId,
            ReportingManagerId = request.ReportingManagerId,
            EpfNumber = request.EpfNumber?.Trim(),
@@ -131,6 +156,8 @@ public sealed class EmployeeService : IEmployeeService
        var employee = await _employees.GetByIdAsync(employeeId, ct)
            ?? throw new NotFoundException($"Employee {employeeId} was not found.");

+        await _branchAccess.EnsureBranchVisibleAsync(employee.BranchId, ct);
+
        if (employee.RowVersion != expectedRowVersion)
            throw new DomainException(ErrorCodes.ConcurrencyConflict, "The employee was modified by another request.", 412);

@@ -154,7 +181,7 @@ public sealed class EmployeeService : IEmployeeService
        employee.DepartmentId = request.DepartmentId;
        employee.DesignationId = request.DesignationId;
        employee.EmploymentTypeId = request.EmploymentTypeId;
-        employee.BranchId = request.BranchId;
+        employee.BranchId = await _branchConfig.ResolveBranchIdAsync(request.BranchId, ct);
        employee.WorkShiftId = request.WorkShiftId;
        employee.ReportingManagerId = request.ReportingManagerId;
        employee.EpfNumber = request.EpfNumber?.Trim();
@@ -185,6 +212,48 @@ public sealed class EmployeeService : IEmployeeService
        await _uow.SaveChangesAsync(ct);
    }

+    public async Task DeleteAsync(int employeeId, CancellationToken ct = default)
+    {
+        var employee = await _employees.GetByIdAsync(employeeId, ct)
+            ?? throw new NotFoundException($"Employee {employeeId} was not found.");
+
+        if (await _payrollLines.Query().AnyAsync(l => l.EmployeeId == employeeId, ct))
+            throw new DomainException(ErrorCodes.EmployeeHasPayrollHistory, "This employee has payroll history and cannot be deleted.", 409);
+
+        // A linked system-user account survives the employee row (Employee.UserId → User is
+        // Restrict, so cascading it away isn't even an option) — deactivate it (same as the
+        // Active/Deactivate toggle on Settings > Users) rather than leaving a login standing
+        // with no staff record behind it. The User row itself is never removed.
+        if (employee.UserId is not null)
+        {
+            var linkedUser = await _users.GetByIdAsync(employee.UserId.Value, ct);
+            if (linkedUser is not null) linkedUser.Status = EntityStatus.Inactive;
+        }
+
+        // Bank details and documents cascade at the DB level, but documents also have a
+        // physical file on disk that cascading the row would silently orphan — delete those
+        // explicitly first. Salary structures, loans, and leave balances are Restrict FKs, so
+        // they must be removed before the employee row itself will delete.
+        var documents = await _documents.Query().Where(d => d.EmployeeId == employeeId).ToListAsync(ct);
+        foreach (var doc in documents)
+        {
+            await _fileStorage.DeleteAsync(doc.RelativePath, ct);
+            _documents.Remove(doc);
+        }
+
+        var salaryStructures = await _salaryStructures.Query().Where(s => s.EmployeeId == employeeId).ToListAsync(ct);
+        foreach (var structure in salaryStructures) _salaryStructures.Remove(structure);
+
+        var loans = await _loans.Query().Where(l => l.EmployeeId == employeeId).ToListAsync(ct);
+        foreach (var loan in loans) _loans.Remove(loan);
+
+        var leaveBalances = await _leaveBalances.Query().Where(b => b.EmployeeId == employeeId).ToListAsync(ct);
+        foreach (var balance in leaveBalances) _leaveBalances.Remove(balance);
+
+        _employees.Remove(employee);
+        await _uow.SaveChangesAsync(ct);
+    }
+
    public async Task<List<EmployeeBankDetailDto>> ListBankDetailsAsync(int employeeId, CancellationToken ct = default)
    {
        return await _bankDetails.Query().AsNoTracking()
@@ -101,5 +101,21 @@ public sealed class EmploymentTypeService : IEmploymentTypeService
        await _uow.SaveChangesAsync(ct);
    }

+    public async Task DeleteAsync(int employmentTypeId, CancellationToken ct = default)
+    {
+        var et = await _employmentTypes.GetByIdAsync(employmentTypeId, ct)
+            ?? throw new NotFoundException($"Employment type {employmentTypeId} was not found.");
+
+        _employmentTypes.Remove(et);
+        try
+        {
+            await _uow.SaveChangesAsync(ct);
+        }
+        catch (DbUpdateException)
+        {
+            throw new DomainException(ErrorCodes.MasterInUse, "This employment type is referenced by other records and cannot be deleted.", 409);
+        }
+    }
+
    private static EmploymentTypeDto Map(EmploymentType e) => new(e.EmploymentTypeId, e.Code, e.Name, e.Status, e.CreatedAt, e.UpdatedAt);
 }
@@ -108,6 +108,22 @@ public sealed class HrDocumentTypeService : IHrDocumentTypeService
        await _uow.SaveChangesAsync(ct);
    }

+    public async Task DeleteAsync(int hrDocumentTypeId, CancellationToken ct = default)
+    {
+        var type = await _types.GetByIdAsync(hrDocumentTypeId, ct)
+            ?? throw new NotFoundException($"Document type {hrDocumentTypeId} was not found.");
+
+        _types.Remove(type);
+        try
+        {
+            await _uow.SaveChangesAsync(ct);
+        }
+        catch (DbUpdateException)
+        {
+            throw new DomainException(ErrorCodes.MasterInUse, "This document type is referenced by other records and cannot be deleted.", 409);
+        }
+    }
+
    private static HrDocumentTypeDto Map(HrDocumentType t) => new(
        t.HrDocumentTypeId, t.Code, t.Name, t.Category, t.RequiredAtOnboarding, t.ExpiryTracked, t.Status, t.CreatedAt, t.UpdatedAt);
 }
@@ -43,6 +43,11 @@ public sealed class LeaveRequestService : ILeaveRequestService
        var q = _requests.Query().AsNoTracking().Include(r => r.Employee).Include(r => r.LeaveType).AsQueryable();
        if (employeeId is not null) q = q.Where(r => r.EmployeeId == employeeId);
        if (status is not null) q = q.Where(r => r.Status == status);
+        if (!string.IsNullOrWhiteSpace(query.Q))
+        {
+            var term = query.Q.Trim();
+            q = q.Where(r => EF.Functions.ILike(r.DocNo, $"%{term}%") || EF.Functions.ILike(r.Employee!.FullName, $"%{term}%"));
+        }

        var total = await q.CountAsync(ct);
        var rows = await q.OrderByDescending(r => r.CreatedAt)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kalana B. Thilakarathna	3a583f80e5	gitea work flow update	2026-09-17 12:28:31 +05:30
ImanThiyanga	83e0335504	Merge pull request 'Dev' (#62 ) from Dev into production Reviewed-on: #62	2026-09-17 05:58:25 +00:00
ImanThiyanga	513343b62a	Merge pull request 'Revert/ci cd merges' (#61 ) from revert/ci-cd-merges into Dev Reviewed-on: #61	2026-09-17 05:57:56 +00:00
ImanThiyanga	256e39ccff	Revert "Merge pull request 'Dev' (#58 ) from Dev into production" This reverts commit `821e96e011`, reversing changes made to `0ff39e9e58`.	2026-09-17 11:25:33 +05:30
ImanThiyanga	efb37fce7a	Revert "Merge pull request 'Dev' (#60 ) from Dev into production" This reverts commit `01fc2582b6`, reversing changes made to `821e96e011`.	2026-09-17 11:25:33 +05:30
ImanThiyanga	01fc2582b6	Merge pull request 'Dev' (#60 ) from Dev into production Reviewed-on: #60	2026-09-16 18:47:15 +00:00
ImanThiyanga	39a2dc60be	Merge pull request 'Feat/ci cd implementation' (#59 ) from feat/ci-cd-implementation into Dev CI/CD - ERP Core / Build & Deploy (pull_request) Failing after 13m56s Details CI/CD - ERP Core / detect (pull_request) Failing after 14m48s Details CI/CD - ERP Core / scripts (pull_request) Failing after 12m24s Details CI/CD - ERP Core / e2e-typecheck (pull_request) Failing after 13m15s Details CI/CD - ERP Core / frontend (pull_request) Failing after 14m7s Details CI/CD - ERP Core / backend (pull_request) Failing after 14m59s Details CI/CD - ERP Core / ci-ok (pull_request) Failing after 14m58s Details Reviewed-on: #59	2026-09-16 18:30:42 +00:00
ImanThiyanga	3b87a6e421	Merge branch 'Dev' into feat/ci-cd-implementation CI/CD - ERP Core / detect (pull_request) Waiting to run Details CI/CD - ERP Core / backend (pull_request) Blocked by required conditions Details CI/CD - ERP Core / frontend (pull_request) Blocked by required conditions Details CI/CD - ERP Core / e2e-typecheck (pull_request) Blocked by required conditions Details CI/CD - ERP Core / scripts (pull_request) Blocked by required conditions Details CI/CD - ERP Core / ci-ok (pull_request) Blocked by required conditions Details CI/CD - ERP Core / Build & Deploy (pull_request) Waiting to run Details	2026-09-16 18:30:22 +00:00
ImanThiyanga	2a7a44cc27	change in to merge CI/CD - ERP Core / detect (pull_request) Failing after 13m11s Details CI/CD - ERP Core / ci-ok (pull_request) Has been cancelled Details CI/CD - ERP Core / Build & Deploy (pull_request) Failing after 12m17s Details CI/CD - ERP Core / backend (pull_request) Has been cancelled Details CI/CD - ERP Core / frontend (pull_request) Has been cancelled Details CI/CD - ERP Core / e2e-typecheck (pull_request) Has been cancelled Details CI/CD - ERP Core / scripts (pull_request) Has been cancelled Details	2026-09-16 23:48:07 +05:30
ImanThiyanga	c7cf63e7de	initiating connection fixes	2026-09-16 23:47:47 +05:30
ImanThiyanga	d1044e4728	final fix	2026-09-16 13:53:57 +05:30
ImanThiyanga	821e96e011	Merge pull request 'Dev' (#58 ) from Dev into production Reviewed-on: #58	2026-09-16 06:37:25 +00:00
ImanThiyanga	d6f973202d	Merge branch 'production' into Dev CI/CD - ERP Core / Build & Deploy (pull_request) Failing after 10m38s Details CI/CD - ERP Core / detect (pull_request) Failing after 11m30s Details CI/CD - ERP Core / scripts (pull_request) Failing after 11m31s Details CI/CD - ERP Core / e2e-typecheck (pull_request) Failing after 12m23s Details CI/CD - ERP Core / frontend (pull_request) Failing after 13m14s Details CI/CD - ERP Core / backend (pull_request) Failing after 14m6s Details CI/CD - ERP Core / ci-ok (pull_request) Failing after 14m59s Details	2026-09-16 06:36:19 +00:00
ImanThiyanga	1d5a5cf68e	Merge pull request 'Feat/ci cd implementation' (#57 ) from feat/ci-cd-implementation into Dev CI/CD - ERP Core / detect (pull_request) Has been cancelled Details CI/CD - ERP Core / backend (pull_request) Has been cancelled Details CI/CD - ERP Core / frontend (pull_request) Has been cancelled Details CI/CD - ERP Core / e2e-typecheck (pull_request) Has been cancelled Details CI/CD - ERP Core / scripts (pull_request) Has been cancelled Details CI/CD - ERP Core / ci-ok (pull_request) Has been cancelled Details CI/CD - ERP Core / Build & Deploy (pull_request) Has been cancelled Details Reviewed-on: #57	2026-09-16 06:24:55 +00:00
ImanThiyanga	8e472ac996	initialising for ci-cd pipeline CI/CD - ERP Core / scripts (pull_request) Failing after 12m21s Details CI/CD - ERP Core / e2e-typecheck (pull_request) Failing after 13m13s Details CI/CD - ERP Core / frontend (pull_request) Failing after 14m5s Details CI/CD - ERP Core / backend (pull_request) Failing after 14m57s Details CI/CD - ERP Core / detect (pull_request) Failing after 13m42s Details CI/CD - ERP Core / Build & Deploy (pull_request) Failing after 12m47s Details CI/CD - ERP Core / ci-ok (pull_request) Failing after 14m58s Details	2026-09-16 11:53:55 +05:30
ImanThiyanga	666979cf22	initiated ci-cd pipeline for the erp core with fronend changes to detect changes on both front and back	2026-09-16 11:53:17 +05:30
ashan_rusiru	eb36e0acfa	Merge pull request 'Users and employees arrangements' (#56 ) from users-and-employees-arrangements into Dev Reviewed-on: #56	2026-09-14 05:23:25 +00:00
ashan_rusiru	0ff39e9e58	Merge pull request 'Users and employees arrangements' (#53 ) from users-and-employees-arrangements into production Reviewed-on: #53	2026-09-13 07:52:34 +00:00
ashan_rusiru	cbb610fc8b	Merge branch 'production' into users-and-employees-arrangements	2026-09-13 07:52:24 +00:00
ashan_rusiru	afa9928dcc	Merge pull request 'bug fixing' (#55 ) from bug-fixing into Dev Reviewed-on: #55	2026-09-13 07:52:06 +00:00
Sasanka	99aa395fb1	updeted	2026-09-13 08:30:18 +05:30
Sasanka	cb41d503c4	emloyee and user fixings	2026-09-11 10:32:47 +05:30
Sasanka	629f3d1f44	bug fixing	2026-09-09 14:38:53 +05:30
ImanThiyanga	b3b6a25ce8	Merge pull request 'Branch crud' (#52 ) from branch-crud into Dev Reviewed-on: #52	2026-09-08 07:13:47 +00:00
Sasanka	f664961fce	branch crud and intergration	2026-09-08 12:13:49 +05:30
ImanThiyanga	b4993b202d	Merge pull request 'Dev' (#45 ) from Dev into production Reviewed-on: #45	2026-08-13 06:52:56 +00:00