feat(grn): add update functionality for draft GRNs and support document-level discounts

- Implemented Update method in GrnsController to allow editing of draft GRNs. - Enhanced CreateGrnRequest to include an optional totalDiscount property. - Updated GrnService to handle GRN updates, including validation and line item processing. - Modified NewGrnPage to support editing existing GRNs and applying document-level discounts. - Improved UI in NewItemPage and GrnDetailPage for better user experience. - Added search functionality to Select component for improved item selection.
2026-08-11 11:00:31 +05:30
695 changed files with 15759 additions and 64199 deletions
@@ -1,106 +0,0 @@
-name: CI/CD - ERP Core Monorepo
-
-on:
-  pull_request:
-    branches:
-      - production
-    types:
-      - closed
-
-jobs:
-  build-and-deploy-backend:
-    name: Build & Deploy 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
-        run: dotnet restore Backend/ERPCore.sln
-      - name: Publish
-        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 service
-        run: systemctl stop erpcore.service
-      - name: Copy 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 ownership and permissions
-        run: |
-          chown -R erpuser:erpuser /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 service
-        # ConnectionStrings__DefaultConnection is supplied by the systemd unit on the host
-        # (Environment= or EnvironmentFile=), deliberately not committed: appsettings.json ships
-        # the key empty and appsettings.Production.json carries no ConnectionStrings section at
-        # all. If the unit does not set it, startup throws before serving and the Verify step
-        # below fails the job.
-        run: systemctl restart erpcore.service
-      - name: Verify
-        run: |
-          # `is-active ... || echo` always exited 0, so a crashed service still reported success.
-          # Wait a few seconds first: a startup failure (bad or missing connection string) happens
-          # during MigrateAsync, after systemctl restart has already returned.
-          sleep 5
-          if ! systemctl is-active --quiet erpcore.service; then
-            echo "❌ erpcore.service is not running:"
-            journalctl -u erpcore.service -n 50 --no-pager
-            exit 1
-          fi
-          echo "✅ Service running"
-
-  build-and-deploy-frontend:
-    name: Build & Deploy Frontend
-    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: Build Docker image
-        run: |
-          docker build --progress=plain --no-cache \
-            -t erpcore-frontend:latest \
-            ./Frontend/erp-system
-      - name: Stop & remove existing container
-        run: |
-          docker stop erpcore-frontend 2>/dev/null || true
-          docker rm erpcore-frontend 2>/dev/null || true
-      - name: Start 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 images
-        run: docker image prune -f
-      - name: Verify
-        run: |
-          docker ps --filter name=erpcore-frontend --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}" \
-            | grep erpcore-frontend && echo "✅ Container running" || echo "❌ Container failed"
@@ -36,4 +36,12 @@ Testing/e2e/test-results/
 Testing/e2e/.auth/
 Testing/e2e/blob-report/

-
+# ── Migrations ─────────────────────────────────────────────────────────
+# Reverted 2026-07-31: excluding new EF Core migrations while
+# ErpDbContextModelSnapshot.cs stayed tracked meant every `dotnet ef
+# migrations add` after the initial 4 silently produced a migration git would
+# never see, while the (tracked) snapshot's changes committed normally —
+# so the snapshot kept claiming tables existed that no migration in git
+# history ever created them. Confirmed live: 25 HRM tables + 11 Manufacturing
+# tables were missing from the actual database for exactly this reason.
+# Migrations now stay tracked like any other source file — commit them.
@@ -1,26 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.20" />
-    <PackageReference Include="coverlet.collector" Version="6.0.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\ERPCore\ERPCore.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Using Include="Xunit" />
-  </ItemGroup>
-
-</Project>
@@ -1,152 +0,0 @@
-using ERPCore.Domain.Entities;
-using ERPCore.Domain.Notifications;
-using ERPCore.Repositories;
-using ERPCore.Services;
-using ERPCore.System.Errors;
-using ERPCore.Tests.TestSupport;
-using Microsoft.EntityFrameworkCore;
-
-namespace ERPCore.Tests;
-
-public class NotificationConfigServiceTests
-{
-    [Fact]
-    public async Task GetAsync_MergesSavedValuesWithDiscoveredModules()
-    {
-        var dbName = Guid.NewGuid().ToString("N");
-        await using var db = NotificationConfigTestSupport.CreateContext(dbName);
-        await NotificationConfigTestSupport.SeedAsync(db, new[]
-        {
-            new NotificationConfigModule
-            {
-                ModuleKey = "sale.create",
-                EmailEnabled = true,
-                SmsEnabled = false,
-                InAppEnabled = true
-            }
-        });
-
-        var service = CreateService(db);
-
-        var result = await service.GetAsync();
-
-        Assert.Equal(1u, result.RowVersion);
-        Assert.Contains(result.Value.Modules, m => m.ModuleKey == "sale.create" && m.EmailEnabled && !m.SmsEnabled && m.InAppEnabled);
-        Assert.Contains(result.Value.Modules, m => m.ModuleKey == "grn.confirmed" && !m.EmailEnabled && !m.SmsEnabled && !m.InAppEnabled);
-    }
-
-    [Fact]
-    public async Task UpdateAsync_PersistsEmptyAndMultiChannelSelections()
-    {
-        var dbName = Guid.NewGuid().ToString("N");
-        await using var db = NotificationConfigTestSupport.CreateContext(dbName);
-        await NotificationConfigTestSupport.SeedAsync(db);
-
-        var service = CreateService(db);
-        var catalog = new NotificationModuleCatalog();
-        var request = new ERPCore.Dtos.Notifications.UpdateNotificationConfigRequest
-        {
-            Modules = catalog.GetAll().Select((module, index) => new ERPCore.Dtos.Notifications.UpdateNotificationModuleRequest
-            {
-                ModuleKey = module.Key,
-                EmailEnabled = index == 0,
-                SmsEnabled = index == 1,
-                InAppEnabled = index == 1
-            }).ToList()
-        };
-
-        var updated = await service.UpdateAsync(request, 1);
-
-        Assert.Equal(2u, updated.RowVersion);
-        Assert.Contains(updated.Value.Modules, m => m.ModuleKey == catalog.GetAll()[0].Key && m.EmailEnabled && !m.SmsEnabled && !m.InAppEnabled);
-        Assert.Contains(updated.Value.Modules, m => m.ModuleKey == catalog.GetAll()[1].Key && !m.EmailEnabled && m.SmsEnabled && m.InAppEnabled);
-
-        await using var verifyDb = NotificationConfigTestSupport.CreateContext(dbName);
-        var persisted = await verifyDb.NotificationConfigModules.AsNoTracking().ToListAsync();
-        Assert.Contains(persisted, m => m.ModuleKey == catalog.GetAll()[0].Key && m.EmailEnabled && !m.SmsEnabled && !m.InAppEnabled);
-        Assert.Contains(persisted, m => m.ModuleKey == catalog.GetAll()[1].Key && !m.EmailEnabled && m.SmsEnabled && m.InAppEnabled);
-    }
-
-    [Fact]
-    public async Task ResolveEnabledChannelsAsync_ReturnsEmptyWhenNothingEnabled()
-    {
-        var dbName = Guid.NewGuid().ToString("N");
-        await using var db = NotificationConfigTestSupport.CreateContext(dbName);
-        await NotificationConfigTestSupport.SeedAsync(db, new[]
-        {
-            new NotificationConfigModule
-            {
-                ModuleKey = "sale.create",
-                EmailEnabled = false,
-                SmsEnabled = false,
-                InAppEnabled = false
-            }
-        });
-
-        var service = CreateService(db);
-
-        var channels = await service.ResolveEnabledChannelsAsync("sale.create");
-
-        Assert.Empty(channels);
-    }
-
-    [Fact]
-    public async Task ResolveEnabledChannelsAsync_ReturnsMultipleChannels()
-    {
-        var dbName = Guid.NewGuid().ToString("N");
-        await using var db = NotificationConfigTestSupport.CreateContext(dbName);
-        await NotificationConfigTestSupport.SeedAsync(db, new[]
-        {
-            new NotificationConfigModule
-            {
-                ModuleKey = "sale.create",
-                EmailEnabled = true,
-                SmsEnabled = true,
-                InAppEnabled = false
-            }
-        });
-
-        var service = CreateService(db);
-
-        var channels = await service.ResolveEnabledChannelsAsync("sale.create");
-
-        Assert.Equal(new[] { NotificationChannel.Email, NotificationChannel.Sms }, channels);
-    }
-
-    [Fact]
-    public async Task UpdateAsync_MapsConcurrencyFailuresToDomainException()
-    {
-        var dbName = Guid.NewGuid().ToString("N");
-        await using var db = NotificationConfigTestSupport.CreateContext(dbName);
-        await NotificationConfigTestSupport.SeedAsync(db);
-
-        var service = CreateService(db, new ThrowingUnitOfWork());
-        var catalog = new NotificationModuleCatalog();
-        var request = new ERPCore.Dtos.Notifications.UpdateNotificationConfigRequest
-        {
-            Modules = catalog.GetAll().Select(module => new ERPCore.Dtos.Notifications.UpdateNotificationModuleRequest
-            {
-                ModuleKey = module.Key,
-                EmailEnabled = false,
-                SmsEnabled = false,
-                InAppEnabled = false
-            }).ToList()
-        };
-
-        var ex = await Assert.ThrowsAsync<DomainException>(() => service.UpdateAsync(request, 1));
-        Assert.Equal(ErrorCodes.ConcurrencyConflict, ex.Code);
-        Assert.Equal(412, ex.StatusCode);
-    }
-
-    private static NotificationConfigService CreateService(ERPCore.Infra.Persistence.ErpDbContext db, ERPCore.Infra.UoW.IUnitOfWork? uow = null)
-    {
-        var configRepo = new Repository<NotificationConfig>(db);
-        var moduleRepo = new Repository<NotificationConfigModule>(db);
-        return new NotificationConfigService(
-            configRepo,
-            moduleRepo,
-            new NotificationModuleCatalog(),
-            new TestCurrentUser(),
-            uow ?? new ERPCore.Infra.UoW.UnitOfWork(db));
-    }
-}
@@ -1,17 +0,0 @@
-using ERPCore.Services;
-
-namespace ERPCore.Tests;
-
-public class NotificationModuleCatalogTests
-{
-    [Fact]
-    public void GetAll_ReturnsStableUniqueModuleKeys()
-    {
-        var catalog = new NotificationModuleCatalog();
-
-        Assert.NotEmpty(catalog.GetAll());
-        Assert.Contains(catalog.GetAll(), m => m.Key == "sale.create");
-        Assert.Contains(catalog.GetAll(), m => m.Key == "grn.confirmed");
-        Assert.Equal(catalog.GetAll().Count, catalog.GetAll().Select(m => m.Key).Distinct(StringComparer.OrdinalIgnoreCase).Count());
-    }
-}
@@ -1,124 +0,0 @@
-using ERPCore.Domain.Entities;
-using ERPCore.Domain.Enums;
-using ERPCore.Dtos.Production;
-using ERPCore.Infra.Auth;
-using ERPCore.Infra.Persistence;
-using ERPCore.Repositories;
-using ERPCore.Services.Production;
-using ERPCore.System.Errors;
-using ERPCore.Tests.TestSupport;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Storage;
-
-namespace ERPCore.Tests;
-
-/// <summary>
-/// Covers the 412 translation on the two production services, which save through
-/// <c>ExecuteInTransactionAsync</c> rather than a bare <c>SaveChangesAsync</c> and so guard
-/// concurrency differently from the inline pattern the other services use.
-/// </summary>
-public class ProductionConcurrencyTests
-{
-    private static readonly InMemoryDatabaseRoot Root = new();
-
-    [Fact]
-    public async Task TemplateUpdateAsync_MapsConcurrencyFailuresToDomainException()
-    {
-        await using var db = CreateContext();
-
-        // Validation runs before the transaction opens, so the referenced item has to exist.
-        db.Items.Add(new Item
-        {
-            ItemId = 1,
-            Sku = "FG-1",
-            Name = "Finished good",
-            CategoryId = 1,
-            BaseUomId = 1,
-            Status = EntityStatus.Active
-        });
-        await db.SaveChangesAsync();
-
-        var service = CreateTemplateService(db);
-
-        var ex = await Assert.ThrowsAsync<DomainException>(
-            () => service.UpdateAsync(1, SingleStageTemplate(), expectedRowVersion: 1));
-
-        Assert.Equal(ErrorCodes.ConcurrencyConflict, ex.Code);
-        Assert.Equal(412, ex.StatusCode);
-    }
-
-    [Fact]
-    public async Task RunUpdateStageQuantitiesAsync_MapsConcurrencyFailuresToDomainException()
-    {
-        await using var db = CreateContext();
-        var service = CreateRunService(db);
-
-        var ex = await Assert.ThrowsAsync<DomainException>(
-            () => service.UpdateStageQuantitiesAsync(1, 1, new UpdateStageQuantitiesRequest()));
-
-        Assert.Equal(ErrorCodes.ConcurrencyConflict, ex.Code);
-        Assert.Equal(412, ex.StatusCode);
-    }
-
-    /// <summary>
-    /// The smallest graph the validator accepts: one stage (both entry and terminal) with a
-    /// stock input and a single item-bearing output, and no edges.
-    /// </summary>
-    private static SaveTemplateRequest SingleStageTemplate() => new()
-    {
-        Code = "TPL-1",
-        Name = "Template 1",
-        Stages =
-        [
-            new SaveStageRequest
-            {
-                Key = "tmp-1",
-                Name = "Mix",
-                Inputs =
-                [
-                    new SaveInputRequest
-                    {
-                        Source = StageInputSource.Stock,
-                        ItemId = 1,
-                        QtyUnit = StageQtyUnit.Pack,
-                        QtyPerBatch = 1m
-                    }
-                ],
-                Outputs =
-                [
-                    new SaveOutputRequest { Key = "tmp-o1", Name = "Output", ItemId = 1, QtyPerBatch = 1m }
-                ]
-            }
-        ]
-    };
-
-    private static ErpDbContext CreateContext()
-    {
-        var options = new DbContextOptionsBuilder<ErpDbContext>()
-            .UseInMemoryDatabase(Guid.NewGuid().ToString("N"), Root)
-            .Options;
-
-        // The real CurrentBranchContext over an unauthenticated user yields IsActive=false,
-        // which leaves the branch query filters off: what a unit test wants.
-        var currentUser = new TestCurrentUser();
-        return new ErpDbContext(options, currentUser, new CurrentBranchContext(currentUser));
-    }
-
-    private static ProductionTemplateService CreateTemplateService(ErpDbContext db)
-        => new(
-            new Repository<ProductionTemplate>(db), new Repository<TemplateStage>(db),
-            new Repository<StageInput>(db), new Repository<StageOutput>(db),
-            new Repository<StageEdge>(db), new Repository<Item>(db),
-            new Repository<Uom>(db), new Repository<ProductionRun>(db),
-            new ThrowingTransactionUnitOfWork(), new TestCurrentUser());
-
-    // The costing, measurement and numbering collaborators are only ever touched inside the
-    // transaction lambda, which ThrowingTransactionUnitOfWork never invokes.
-    private static ProductionRunService CreateRunService(ErpDbContext db)
-        => new(
-            new Repository<ProductionRun>(db), new Repository<ProductionTemplate>(db),
-            new Repository<Warehouse>(db), new Repository<Bin>(db),
-            new Repository<Item>(db), new Repository<ReasonCode>(db),
-            fifo: null!, measure: null!, numbers: null!,
-            new ThrowingTransactionUnitOfWork(), new TestCurrentUser());
-}
@@ -1,99 +0,0 @@
-using ERPCore.Domain.Entities;
-using ERPCore.Infra.Auth;
-using ERPCore.Infra.Persistence;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Storage;
-
-namespace ERPCore.Tests.TestSupport;
-
-internal sealed class TestCurrentUser : ICurrentUser
-{
-    public string UserId => "system";
-    public int AuditUserId => User.SystemUserId;
-    public bool IsAuthenticated => false;
-
-    // Unauthenticated, so no role claim and no branch scoping: the three members the
-    // AuthHex integration added to ICurrentUser.
-    public string? RoleCode => null;
-    public bool IsAdmin => false;
-    public int? BranchId => null;
-}
-
-internal sealed class ThrowingUnitOfWork : ERPCore.Infra.UoW.IUnitOfWork
-{
-    public Task<int> SaveChangesAsync(CancellationToken ct = default)
-        => throw new DbUpdateConcurrencyException("Test concurrency conflict.");
-
-    public Task ExecuteInTransactionAsync(Func<CancellationToken, Task> action, CancellationToken ct = default)
-        => throw new NotSupportedException();
-
-    public Task<T> ExecuteInTransactionAsync<T>(Func<CancellationToken, Task<T>> action, CancellationToken ct = default)
-        => throw new NotSupportedException();
-}
-
-/// <summary>
-/// Fails the transactional path the way a lost optimistic-concurrency race does, so the
-/// services that save through <c>ExecuteInTransactionAsync</c> can be covered too. The
-/// lambda is never invoked, which is the point: the real <c>UnitOfWork</c> issues its own
-/// <c>SaveChangesAsync</c> after the lambda returns, so the catch under test has to sit
-/// outside it.
-/// </summary>
-internal sealed class ThrowingTransactionUnitOfWork : ERPCore.Infra.UoW.IUnitOfWork
-{
-    public Task<int> SaveChangesAsync(CancellationToken ct = default)
-        => throw new DbUpdateConcurrencyException("Test concurrency conflict.");
-
-    public Task ExecuteInTransactionAsync(Func<CancellationToken, Task> action, CancellationToken ct = default)
-        => throw new DbUpdateConcurrencyException("Test concurrency conflict.");
-
-    public Task<T> ExecuteInTransactionAsync<T>(Func<CancellationToken, Task<T>> action, CancellationToken ct = default)
-        => throw new DbUpdateConcurrencyException("Test concurrency conflict.");
-}
-
-internal static class NotificationConfigTestSupport
-{
-    private static readonly InMemoryDatabaseRoot Root = new();
-
-    public static ErpDbContext CreateContext(string name)
-    {
-        var options = new DbContextOptionsBuilder<ErpDbContext>()
-            .UseInMemoryDatabase(name, Root)
-            .Options;
-
-        // The real CurrentBranchContext over an unauthenticated user yields IsActive=false,
-        // which leaves the branch query filters off: what a unit test wants.
-        var currentUser = new TestCurrentUser();
-        return new ErpDbContext(options, currentUser, new CurrentBranchContext(currentUser));
-    }
-
-    public static async Task SeedAsync(ErpDbContext db, IEnumerable<NotificationConfigModule>? modules = null)
-    {
-        db.Users.Add(new User
-        {
-            UserId = User.SystemUserId,
-            Username = "system",
-            DisplayName = "System"
-        });
-
-        var config = new NotificationConfig
-        {
-            NotificationConfigId = NotificationConfig.SingletonId,
-            UpdatedBy = User.SystemUserId,
-            UpdatedAt = DateTime.UtcNow,
-            // No RowVersion here on purpose: ErpDbContext.BumpRowVersions stamps every
-            // inserted row with 1, so any seeded value is overwritten on save.
-        };
-
-        if (modules is not null)
-        {
-            foreach (var module in modules)
-            {
-                module.NotificationConfigId = NotificationConfig.SingletonId;
-                config.Modules.Add(module);
-            }
-        }
-
-        db.NotificationConfig.Add(config);
-        await db.SaveChangesAsync();
-    }
-}
@@ -27,15 +27,13 @@ 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, IAuditService audit)
+    public AuthController(IAuthUserService users, IAuthRecoveryService recovery, IAuthAltService alt, IRoleService roles)
    {
        _users = users;
        _recovery = recovery;
        _alt = alt;
        _roles = roles;
-        _audit = audit;
    }

    /// <summary>
@@ -70,7 +68,6 @@ 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);
    }

@@ -81,13 +78,9 @@ 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)]
@@ -1,47 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
-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")]
-[Authorize(Policy = NavPolicies.Prefix + "settings")]
-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);
-    }
-}
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Domain.Enums;
 using ERPCore.Dtos.Brands;
 using ERPCore.Dtos.Common;
@@ -10,7 +8,6 @@ namespace ERPCore.Controllers;

 /// <summary>Brand master endpoints (docs/11-BACKEND-PHASE1.md §2.6).</summary>
 [Route("api/v1/brands")]
-[Authorize(Policy = NavPolicies.Prefix + "products")]
 public sealed class BrandsController : ApiControllerBase
 {
    private readonly IBrandService _brands;
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Domain.Enums;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Sales;
@@ -9,7 +7,6 @@ using Microsoft.AspNetCore.Mvc;
 namespace ERPCore.Controllers;

 [Route("api/v1/bundle-sales")]
-[Authorize(Policy = NavPolicies.Prefix + "sales")]
 public sealed class BundleSalesController : ApiControllerBase
 {
    private readonly IBundleSaleService _bundles;
@@ -32,14 +29,6 @@ public sealed class BundleSalesController : ApiControllerBase
        return result is null ? NotFound() : Ok(result);
    }

-    [HttpPost("templates")]
-    [ProducesResponseType(typeof(BundleSaleTemplateDto), StatusCodes.Status201Created)]
-    public async Task<ActionResult<BundleSaleTemplateDto>> CreateTemplate([FromBody] CreateBundleSaleTemplateRequest request, CancellationToken ct)
-    {
-        var result = await _bundles.CreateTemplateAsync(request, ct);
-        return Created($"/api/v1/bundle-sales/templates/{result.BundleSaleTemplateId}", result);
-    }
-
    [HttpGet]
    [ProducesResponseType(typeof(PagedResponse<BundleSaleSummaryDto>), StatusCodes.Status200OK)]
    public async Task<ActionResult<PagedResponse<BundleSaleSummaryDto>>> List(
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Domain.Enums;
 using ERPCore.Dtos.Categories;
 using ERPCore.Dtos.Common;
@@ -14,7 +12,6 @@ namespace ERPCore.Controllers;
 /// <c>?tree=true</c> parameter is gone along with the self-nesting model.
 /// </summary>
 [Route("api/v1/categories")]
-[Authorize(Policy = NavPolicies.Prefix + "products")]
 public sealed class CategoriesController : ApiControllerBase
 {
    private readonly ICategoryService _categories;
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Domain.Enums;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Customers;
@@ -10,7 +8,6 @@ namespace ERPCore.Controllers;

 /// <summary>Customer master endpoints for Phase 1 sales.</summary>
 [Route("api/v1/customers")]
-[Authorize(Policy = NavPolicies.Prefix + "sales")]
 public sealed class CustomersController : ApiControllerBase
 {
    private readonly ICustomerService _customers;
@@ -23,10 +20,8 @@ public sealed class CustomersController : ApiControllerBase
        [FromQuery] PageQuery query,
        [FromQuery] EntityStatus? status,
        [FromQuery] CustomerType? customerType,
-        CancellationToken ct,
-        [FromQuery] bool includeCashCustomer = false,
-        [FromQuery] int? branchId = null)
-        => Ok(await _customers.ListAsync(query, status, customerType, includeCashCustomer, branchId, ct));
+        CancellationToken ct)
+        => Ok(await _customers.ListAsync(query, status, customerType, ct));

    [HttpGet("{customerId:int}")]
    [ProducesResponseType(typeof(CustomerDto), StatusCodes.Status200OK)]
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Dtos.Dashboard;
 using ERPCore.Services.Interfaces;
 using Microsoft.AspNetCore.Mvc;
@@ -8,7 +6,6 @@ namespace ERPCore.Controllers;

 /// <summary>Dashboard overview stats — cross-domain counts, not a stored entity.</summary>
 [Route("api/v1/dashboard")]
-[Authorize(Policy = NavPolicies.Prefix + "dashboard")]
 public sealed class DashboardController : ApiControllerBase
 {
    private readonly IDashboardService _dashboard;
@@ -18,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([FromQuery] int? branchId, CancellationToken ct)
-        => Ok(await _dashboard.GetStatsAsync(branchId, ct));
+    public async Task<ActionResult<DashboardStatsDto>> GetStats(CancellationToken ct)
+        => Ok(await _dashboard.GetStatsAsync(ct));
 }
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Domain.Enums;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Sales;
@@ -14,7 +12,6 @@ namespace ERPCore.Controllers;
 /// the existing sales-slip CRUD surface under a more business-friendly route.
 /// </summary>
 [Route("api/v1/free-issues")]
-[Authorize(Policy = NavPolicies.Prefix + "sales")]
 public sealed class FreeIssuesController : ApiControllerBase
 {
    private readonly ISalesSlipService _slips;
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Services.Interfaces;
 using Microsoft.AspNetCore.Mvc;

@@ -16,7 +14,6 @@ namespace ERPCore.Controllers;
 /// only and is never exposed to the frontend.
 /// </summary>
 [Route("api/v1/gl")]
-[Authorize(Policy = NavPolicies.Prefix + "ledgers")]
 public sealed class GeneralLedgerController : ApiControllerBase
 {
    private readonly IGeneralLedgerService _gl;
@@ -1,45 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
-using ERPCore.Dtos.Config;
-using ERPCore.Services.Interfaces;
-using Microsoft.AspNetCore.Mvc;
-
-namespace ERPCore.Controllers;
-
-/// <summary>
-/// GRN configuration endpoints — warehouse selection and the default receiving warehouse.
-/// <para>
-/// <b>Authorization:</b> gated on the Receiving nav policy (the New GRN form has to read it), same
-/// Phase-1 posture as <see cref="SalesConfigController"/>.
-/// </para>
-/// </summary>
-[Route("api/v1/grn-config")]
-[Authorize(Policy = NavPolicies.Prefix + "receiving")]
-public sealed class GrnConfigController : ApiControllerBase
-{
-    private readonly IGrnConfigService _config;
-
-    public GrnConfigController(IGrnConfigService config) => _config = config;
-
-    [HttpGet]
-    [ProducesResponseType(typeof(GrnConfigDto), StatusCodes.Status200OK)]
-    public async Task<ActionResult<GrnConfigDto>> Get(CancellationToken ct)
-    {
-        var result = await _config.GetAsync(ct);
-        SetETag(result.RowVersion);
-        return Ok(result.Value);
-    }
-
-    [HttpPut]
-    [ProducesResponseType(typeof(GrnConfigDto), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status412PreconditionFailed)]
-    public async Task<ActionResult<GrnConfigDto>> Update(
-        [FromBody] UpdateGrnConfigRequest request, CancellationToken ct)
-    {
-        var expected = RequireIfMatch();
-        var result = await _config.UpdateAsync(request, expected, ct);
-        SetETag(result.RowVersion);
-        return Ok(result.Value);
-    }
-}
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Domain.Enums;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Grn;
@@ -10,23 +8,19 @@ namespace ERPCore.Controllers;

 /// <summary>Goods-receipt endpoints (docs/11 §4).</summary>
 [Route("api/v1/grns")]
-[Authorize(Policy = NavPolicies.Prefix + "receiving")]
 public sealed class GrnsController : ApiControllerBase
 {
    private readonly IGrnService _grns;

-    public GrnsController(IGrnService grns)
-    {
-        _grns = grns;
-    }
+    public GrnsController(IGrnService grns) => _grns = grns;

    /// <summary>List GRNs, newest first.</summary>
    [HttpGet]
    [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, [FromQuery] int? branchId, CancellationToken ct)
-        => Ok(await _grns.ListAsync(query, status, poId, vendorId, warehouseId, branchId, ct));
+        [FromQuery] int? vendorId, [FromQuery] int? warehouseId, CancellationToken ct)
+        => Ok(await _grns.ListAsync(query, status, poId, vendorId, warehouseId, ct));

    [HttpGet("{grnId:int}")]
    [ProducesResponseType(typeof(GrnDto), StatusCodes.Status200OK)]
@@ -48,6 +42,18 @@ public sealed class GrnsController : ApiControllerBase
        return Created($"/api/v1/grns/{dto.GrnId}", dto);
    }

+    /// <summary>Update a Draft GRN's header/lines.</summary>
+    [HttpPut("{grnId:int}")]
+    [ProducesResponseType(typeof(GrnDto), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    [ProducesResponseType(StatusCodes.Status409Conflict)]
+    [ProducesResponseType(StatusCodes.Status422UnprocessableEntity)]
+    public async Task<ActionResult<GrnDto>> Update(int grnId, [FromBody] CreateGrnRequest request, CancellationToken ct)
+    {
+        var dto = await _grns.UpdateAsync(grnId, request, ct);
+        return Ok(dto);
+    }
+
    /// <summary>Confirm: create FIFO layers + inbound ledger + update PO receipts (single UoW txn).</summary>
    [HttpPost("{grnId:int}/confirm")]
    [ProducesResponseType(typeof(GrnConfirmResultDto), StatusCodes.Status200OK)]
@@ -61,14 +61,4 @@ 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,14 +62,4 @@ 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,14 +61,4 @@ 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,6 +83,7 @@ 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)]
@@ -92,17 +93,6 @@ 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(typeof(EmployeeDeleteResultDto), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [ProducesResponseType(StatusCodes.Status409Conflict)]
-    public async Task<ActionResult<EmployeeDeleteResultDto>> Delete(int employeeId, [FromQuery] bool deleteUserAccount, CancellationToken ct)
-    {
-        var result = await _employees.DeleteAsync(employeeId, deleteUserAccount, ct);
-        return Ok(result);
-    }
-
    [HttpPost("{employeeId:int}/link-user")]
    [ProducesResponseType(StatusCodes.Status204NoContent)]
    [ProducesResponseType(StatusCodes.Status404NotFound)]
@@ -61,14 +61,4 @@ 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,14 +61,4 @@ 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,14 +61,4 @@ 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,14 +61,4 @@ 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,14 +61,4 @@ 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();
-    }
 }
@@ -1,64 +0,0 @@
-using ERPCore.Dtos.Items;
-using ERPCore.Infra.Auth;
-using ERPCore.Services;
-using ERPCore.Services.Interfaces;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace ERPCore.Controllers;
-
-/// <summary>Item photos. Same access as the item master itself.</summary>
-[Route("api/v1/items/{itemId:int}/images")]
-[Authorize(Policy = NavPolicies.Prefix + "products")]
-public sealed class ItemImagesController : ApiControllerBase
-{
-    private readonly IItemImageService _images;
-    private readonly ICurrentUser _currentUser;
-
-    public ItemImagesController(IItemImageService images, ICurrentUser currentUser)
-    {
-        _images = images;
-        _currentUser = currentUser;
-    }
-
-    [HttpGet]
-    [ProducesResponseType(typeof(List<ItemImageDto>), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<ActionResult<List<ItemImageDto>>> List(int itemId, CancellationToken ct)
-        => Ok(await _images.ListAsync(itemId, ct));
-
-    /// <summary>Upload one image (multipart <c>file</c>). 422 CONFIG_DISABLED while item images are off.</summary>
-    [HttpPost]
-    [RequestSizeLimit(ItemImageService.MaxSizeBytes + 64 * 1024)]
-    [ProducesResponseType(typeof(ItemImageDto), StatusCodes.Status201Created)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [ProducesResponseType(StatusCodes.Status413PayloadTooLarge)]
-    [ProducesResponseType(StatusCodes.Status422UnprocessableEntity)]
-    public async Task<ActionResult<ItemImageDto>> Upload(int itemId, IFormFile file, CancellationToken ct)
-    {
-        await using var stream = file.OpenReadStream();
-        var result = await _images.UploadAsync(itemId, stream, file.FileName, file.ContentType, _currentUser.AuditUserId, ct);
-        return Created($"/api/v1/items/{itemId}/images/{result.ItemImageId}", result);
-    }
-
-    /// <summary>The image bytes, served inline so an &lt;img&gt; can point straight at it.</summary>
-    [HttpGet("{itemImageId:int}/content")]
-    [ProducesResponseType(StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<IActionResult> Content(int itemId, int itemImageId, CancellationToken ct)
-    {
-        var (content, contentType) = await _images.OpenAsync(itemId, itemImageId, ct);
-        // Stored files are immutable (new upload ⇒ new id), so the browser may cache them.
-        Response.Headers.CacheControl = "private, max-age=86400";
-        return File(content, contentType);
-    }
-
-    [HttpDelete("{itemImageId:int}")]
-    [ProducesResponseType(StatusCodes.Status204NoContent)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<IActionResult> Delete(int itemId, int itemImageId, CancellationToken ct)
-    {
-        await _images.DeleteAsync(itemId, itemImageId, ct);
-        return NoContent();
-    }
-}
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Domain.Enums;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.ItemTypes;
@@ -15,7 +13,6 @@ namespace ERPCore.Controllers;
 /// into the client-generated SKU (docs/10 Part C.9).
 /// </summary>
 [Route("api/v1/item-types")]
-[Authorize(Policy = NavPolicies.Prefix + "products")]
 public sealed class ItemTypesController : ApiControllerBase
 {
    private readonly IItemTypeService _itemTypes;
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Domain.Enums;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Items;
@@ -10,7 +8,6 @@ namespace ERPCore.Controllers;

 /// <summary>Item master endpoints (docs/11-BACKEND-PHASE1.md §2.1–2.2).</summary>
 [Route("api/v1/items")]
-[Authorize(Policy = NavPolicies.Prefix + "products")]
 public sealed class ItemsController : ApiControllerBase
 {
    private readonly IItemService _items;
@@ -30,33 +27,6 @@ public sealed class ItemsController : ApiControllerBase
        CancellationToken ct)
        => Ok(await _items.ListAsync(query, status, categoryId, subCategoryId, brandId, trackingMode, ct));

-    /// <summary>Items list enriched with stock value, low-stock, last-purchase and
-    /// trailing-30-day sales aggregates, for the Items overview table.</summary>
-    [HttpGet("overview")]
-    [ProducesResponseType(typeof(PagedResponse<ItemOverviewDto>), StatusCodes.Status200OK)]
-    public async Task<ActionResult<PagedResponse<ItemOverviewDto>>> Overview(
-        [FromQuery] PageQuery query,
-        [FromQuery] EntityStatus? status,
-        [FromQuery] int? categoryId,
-        [FromQuery] int? subCategoryId,
-        [FromQuery] int? brandId,
-        [FromQuery] TrackingMode? trackingMode,
-        [FromQuery] StockNature? stockNature,
-        [FromQuery] ItemStockFilter? stock,
-        CancellationToken ct)
-        => Ok(await _items.GetOverviewAsync(query, status, categoryId, subCategoryId, brandId, trackingMode, stockNature, stock, ct));
-
-    /// <summary>Barcode/RFID lookup — matches an item's barcode/SKU, or a batch/serial
-    /// barcode/no (optionally scoped to <paramref name="itemId"/> first).</summary>
-    [HttpGet("scan")]
-    [ProducesResponseType(typeof(ItemScanResultDto), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<ActionResult<ItemScanResultDto>> Scan([FromQuery] string code, [FromQuery] int? itemId, CancellationToken ct)
-    {
-        var result = await _items.ScanAsync(code, itemId, ct);
-        return result is null ? NotFound() : Ok(result);
-    }
-
    /// <summary>Get a single item; returns an <c>ETag</c> for optimistic concurrency.</summary>
    [HttpGet("{itemId:int}")]
    [ProducesResponseType(typeof(ItemDetailDto), StatusCodes.Status200OK)]
@@ -111,4 +81,11 @@ public sealed class ItemsController : ApiControllerBase
    [ProducesResponseType(StatusCodes.Status404NotFound)]
    public async Task<ActionResult<ItemReorderSettingsDto>> UpdateReorder(int itemId, [FromBody] UpdateReorderRequest request, CancellationToken ct)
        => Ok(await _items.UpdateReorderAsync(itemId, request, ct));
+
+    /// <summary>Replace the item's UOM conversions (FR-MD-02).</summary>
+    [HttpPut("{itemId:int}/uom-conversions")]
+    [ProducesResponseType(typeof(ItemUomConversionsDto), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public async Task<ActionResult<ItemUomConversionsDto>> UpdateUomConversions(int itemId, [FromBody] UpdateUomConversionsRequest request, CancellationToken ct)
+        => Ok(await _items.UpdateUomConversionsAsync(itemId, request, ct));
 }
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Dtos.Audit;
 using ERPCore.Dtos.Common;
 using ERPCore.Services.Interfaces;
@@ -12,7 +10,6 @@ namespace ERPCore.Controllers;
 /// Data only — no posting in Phase 1.
 /// </summary>
 [Route("api/v1/journal-entries")]
-[Authorize(Policy = NavPolicies.Prefix + "ledgers")]
 public sealed class JournalEntriesController : ApiControllerBase
 {
    private readonly IAuditService _audit;
@@ -1,37 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
-using ERPCore.Dtos.Notifications;
-using ERPCore.Services.Interfaces;
-using Microsoft.AspNetCore.Mvc;
-
-namespace ERPCore.Controllers;
-
-[Route("api/v1/notification-config")]
-[Authorize(Policy = NavPolicies.Prefix + "settings")]
-public sealed class NotificationConfigController : ApiControllerBase
-{
-    private readonly INotificationConfigService _config;
-
-    public NotificationConfigController(INotificationConfigService config) => _config = config;
-
-    [HttpGet]
-    [ProducesResponseType(typeof(NotificationConfigDto), StatusCodes.Status200OK)]
-    public async Task<ActionResult<NotificationConfigDto>> Get(CancellationToken ct)
-    {
-        var result = await _config.GetAsync(ct);
-        SetETag(result.RowVersion);
-        return Ok(result.Value);
-    }
-
-    [HttpPut]
-    [ProducesResponseType(typeof(NotificationConfigDto), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status412PreconditionFailed)]
-    public async Task<ActionResult<NotificationConfigDto>> Update([FromBody] UpdateNotificationConfigRequest request, CancellationToken ct)
-    {
-        var expected = RequireIfMatch();
-        var result = await _config.UpdateAsync(request, expected, ct);
-        SetETag(result.RowVersion);
-        return Ok(result.Value);
-    }
-}
@@ -1,32 +0,0 @@
-using ERPCore.Infra.Auth;
-using ERPCore.Services.Interfaces;
-using Microsoft.AspNetCore.Mvc;
-
-namespace ERPCore.Controllers;
-
-[Route("api/v1/notifications")]
-public sealed class NotificationsController : ApiControllerBase
-{
-    private readonly INotificationService _notifications;
-    private readonly ICurrentUser _currentUser;
-
-    public NotificationsController(INotificationService notifications, ICurrentUser currentUser)
-    {
-        _notifications = notifications;
-        _currentUser = currentUser;
-    }
-
-    [HttpGet]
-    public async Task<ActionResult> Get([FromQuery] int take = 20, CancellationToken ct = default)
-    {
-        var feed = await _notifications.GetFeedAsync(_currentUser.AuditUserId, take, ct);
-        return Ok(feed);
-    }
-
-    [HttpPost("mark-all-read")]
-    public async Task<ActionResult> MarkAllRead(CancellationToken ct)
-    {
-        await _notifications.MarkAllReadAsync(_currentUser.AuditUserId, ct);
-        return NoContent();
-    }
-}
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Dtos.Config;
 using ERPCore.Services.Interfaces;
 using Microsoft.AspNetCore.Mvc;
@@ -18,7 +16,6 @@ namespace ERPCore.Controllers;
 /// </para>
 /// </summary>
 [Route("api/v1/product-config")]
-[Authorize(Policy = NavPolicies.Prefix + "products")]
 public sealed class ProductConfigController : ApiControllerBase
 {
    private readonly IProductConfigService _config;
@@ -45,4 +42,5 @@ public sealed class ProductConfigController : ApiControllerBase
        var result = await _config.UpdateAsync(request, expected, ct);
        SetETag(result.RowVersion);
        return Ok(result.Value);
-    }}
+    }
+}
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Domain.Enums;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Production;
@@ -10,7 +8,6 @@ namespace ERPCore.Controllers;

 /// <summary>Production run endpoints (docs/30-BACKEND-PHASE2.md §D.2–D.3).</summary>
 [Route("api/v1/production-runs")]
-[Authorize(Policy = NavPolicies.Prefix + "production")]
 public sealed class ProductionRunsController : ApiControllerBase
 {
    private readonly IProductionRunService _runs;
@@ -27,19 +24,6 @@ public sealed class ProductionRunsController : ApiControllerBase
        CancellationToken ct)
        => Ok(await _runs.ListAsync(query, status, templateId, warehouseId, ct));

-    /// <summary>Produced-items report (FR-MFG-13): one row per run that has produced
-    /// something, plus a summary total over every filtered row.</summary>
-    [HttpGet("produced")]
-    [ProducesResponseType(typeof(ProducedListResponseDto), StatusCodes.Status200OK)]
-    public async Task<ActionResult<ProducedListResponseDto>> ListProduced(
-        [FromQuery] DateOnly? from,
-        [FromQuery] DateOnly? to,
-        [FromQuery] int? templateId,
-        [FromQuery] int? warehouseId,
-        [FromQuery] ProductionRunStatus? status,
-        CancellationToken ct)
-        => Ok(await _runs.ListProducedAsync(from, to, templateId, warehouseId, status, ct));
-
    [HttpGet("{runId:int}")]
    [ProducesResponseType(typeof(RunGraphDto), StatusCodes.Status200OK)]
    [ProducesResponseType(StatusCodes.Status404NotFound)]
@@ -56,7 +40,6 @@ public sealed class ProductionRunsController : ApiControllerBase
    [ProducesResponseType(typeof(RunGraphDto), StatusCodes.Status201Created)]
    [ProducesResponseType(StatusCodes.Status404NotFound)]
    [ProducesResponseType(StatusCodes.Status422UnprocessableEntity)]
-    [ProducesResponseType(StatusCodes.Status412PreconditionFailed)]
    public async Task<ActionResult<RunGraphDto>> Create([FromBody] CreateRunRequest request, CancellationToken ct)
    {
        var result = await _runs.CreateAsync(request, ct);
@@ -70,7 +53,6 @@ public sealed class ProductionRunsController : ApiControllerBase
    [ProducesResponseType(StatusCodes.Status404NotFound)]
    [ProducesResponseType(StatusCodes.Status409Conflict)]
    [ProducesResponseType(StatusCodes.Status422UnprocessableEntity)]
-    [ProducesResponseType(StatusCodes.Status412PreconditionFailed)]
    public async Task<ActionResult<RunStageDto>> UpdateQuantities(
        int runId, int runStageId, [FromBody] UpdateStageQuantitiesRequest request, CancellationToken ct)
        => Ok(await _runs.UpdateStageQuantitiesAsync(runId, runStageId, request, ct));
@@ -88,7 +70,6 @@ public sealed class ProductionRunsController : ApiControllerBase
    [ProducesResponseType(StatusCodes.Status404NotFound)]
    [ProducesResponseType(StatusCodes.Status409Conflict)]
    [ProducesResponseType(StatusCodes.Status422UnprocessableEntity)]
-    [ProducesResponseType(StatusCodes.Status412PreconditionFailed)]
    public async Task<ActionResult<StartStageResultDto>> Start(
        int runId, int runStageId,
        [FromHeader(Name = "Idempotency-Key")] string? idempotencyKey,
@@ -101,7 +82,6 @@ public sealed class ProductionRunsController : ApiControllerBase
    [ProducesResponseType(StatusCodes.Status404NotFound)]
    [ProducesResponseType(StatusCodes.Status409Conflict)]
    [ProducesResponseType(StatusCodes.Status422UnprocessableEntity)]
-    [ProducesResponseType(StatusCodes.Status412PreconditionFailed)]
    public async Task<ActionResult<RunStageDto>> Complete(
        int runId, int runStageId, [FromBody] CompleteStageRequest request,
        [FromHeader(Name = "Idempotency-Key")] string? idempotencyKey,
@@ -113,7 +93,6 @@ public sealed class ProductionRunsController : ApiControllerBase
    [ProducesResponseType(StatusCodes.Status404NotFound)]
    [ProducesResponseType(StatusCodes.Status409Conflict)]
    [ProducesResponseType(StatusCodes.Status422UnprocessableEntity)]
-    [ProducesResponseType(StatusCodes.Status412PreconditionFailed)]
    public async Task<ActionResult<ApproveStageResultDto>> Approve(
        int runId, int runStageId, [FromBody] ApproveStageRequest? request,
        [FromHeader(Name = "Idempotency-Key")] string? idempotencyKey,
@@ -125,7 +104,6 @@ public sealed class ProductionRunsController : ApiControllerBase
    [ProducesResponseType(StatusCodes.Status404NotFound)]
    [ProducesResponseType(StatusCodes.Status409Conflict)]
    [ProducesResponseType(StatusCodes.Status422UnprocessableEntity)]
-    [ProducesResponseType(StatusCodes.Status412PreconditionFailed)]
    public async Task<ActionResult<TransferResultDto>> Transfer(
        int runId, int runStageId, [FromBody] TransferRemainderRequest request,
        [FromHeader(Name = "Idempotency-Key")] string? idempotencyKey,
@@ -138,7 +116,6 @@ public sealed class ProductionRunsController : ApiControllerBase
    [ProducesResponseType(StatusCodes.Status404NotFound)]
    [ProducesResponseType(StatusCodes.Status409Conflict)]
    [ProducesResponseType(StatusCodes.Status422UnprocessableEntity)]
-    [ProducesResponseType(StatusCodes.Status412PreconditionFailed)]
    public async Task<ActionResult<ReturnLeftoverResultDto>> ReturnLeftover(
        int runId, int runInputId, [FromBody] ReturnLeftoverRequest request,
        [FromHeader(Name = "Idempotency-Key")] string? idempotencyKey,
@@ -149,7 +126,6 @@ public sealed class ProductionRunsController : ApiControllerBase
    [ProducesResponseType(typeof(RejectIntakeResultDto), StatusCodes.Status200OK)]
    [ProducesResponseType(StatusCodes.Status404NotFound)]
    [ProducesResponseType(StatusCodes.Status409Conflict)]
-    [ProducesResponseType(StatusCodes.Status412PreconditionFailed)]
    public async Task<ActionResult<RejectIntakeResultDto>> RejectIntake(
        int runId, int runStageId, [FromBody] RejectRequest? request,
        [FromHeader(Name = "Idempotency-Key")] string? idempotencyKey,
@@ -161,7 +137,6 @@ public sealed class ProductionRunsController : ApiControllerBase
    [ProducesResponseType(typeof(TerminalRejectResultDto), StatusCodes.Status200OK)]
    [ProducesResponseType(StatusCodes.Status404NotFound)]
    [ProducesResponseType(StatusCodes.Status409Conflict)]
-    [ProducesResponseType(StatusCodes.Status412PreconditionFailed)]
    public async Task<ActionResult<TerminalRejectResultDto>> Reject(
        int runId, int runStageId, [FromBody] RejectRequest? request,
        [FromHeader(Name = "Idempotency-Key")] string? idempotencyKey,
@@ -174,7 +149,6 @@ public sealed class ProductionRunsController : ApiControllerBase
    [ProducesResponseType(StatusCodes.Status404NotFound)]
    [ProducesResponseType(StatusCodes.Status409Conflict)]
    [ProducesResponseType(StatusCodes.Status422UnprocessableEntity)]
-    [ProducesResponseType(StatusCodes.Status412PreconditionFailed)]
    public async Task<ActionResult<CancelRunResultDto>> Cancel(
        int runId, [FromBody] CancelRunRequest request,
        [FromHeader(Name = "Idempotency-Key")] string? idempotencyKey,
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Domain.Enums;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Production;
@@ -10,7 +8,6 @@ namespace ERPCore.Controllers;

 /// <summary>Production template endpoints (docs/30-BACKEND-PHASE2.md §D.1).</summary>
 [Route("api/v1/production-templates")]
-[Authorize(Policy = NavPolicies.Prefix + "production")]
 public sealed class ProductionTemplatesController : ApiControllerBase
 {
    private readonly IProductionTemplateService _templates;
@@ -1,105 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
-using ERPCore.Domain.Enums;
-using ERPCore.Dtos.Common;
-using ERPCore.Dtos.Grn;
-using ERPCore.Dtos.Procurement;
-using ERPCore.Services.Interfaces;
-using Microsoft.AspNetCore.Mvc;
-
-namespace ERPCore.Controllers;
-
-/// <summary>Purchase invoice endpoints — vendor invoices consolidating Confirmed GRNs.</summary>
-[Route("api/v1/purchase-invoices")]
-[Authorize(Policy = NavPolicies.Prefix + "procurement")]
-public sealed class PurchaseInvoicesController : ApiControllerBase
-{
-    private readonly IPurchaseInvoiceService _invoices;
-    private readonly IPurchaseInvoicePaymentService _payments;
-
-    public PurchaseInvoicesController(IPurchaseInvoiceService invoices, IPurchaseInvoicePaymentService payments)
-    {
-        _invoices = invoices;
-        _payments = payments;
-    }
-
-    [HttpGet]
-    [ProducesResponseType(typeof(PagedResponse<PurchaseInvoiceSummaryDto>), StatusCodes.Status200OK)]
-    public async Task<ActionResult<PagedResponse<PurchaseInvoiceSummaryDto>>> List(
-        [FromQuery] PageQuery query, [FromQuery] PurchaseInvoiceStatus? status, [FromQuery] int? vendorId, CancellationToken ct)
-        => Ok(await _invoices.ListAsync(query, status, vendorId, ct));
-
-    /// <summary>Confirmed, not-yet-invoiced GRNs for a vendor — candidates for a new/edited invoice.</summary>
-    [HttpGet("eligible-grns")]
-    [ProducesResponseType(typeof(IReadOnlyList<GrnEligibleForInvoiceDto>), StatusCodes.Status200OK)]
-    public async Task<ActionResult<IReadOnlyList<GrnEligibleForInvoiceDto>>> EligibleGrns([FromQuery] int vendorId, CancellationToken ct)
-        => Ok(await _invoices.ListEligibleGrnsAsync(vendorId, ct));
-
-    [HttpGet("{purchaseInvoiceId:int}")]
-    [ProducesResponseType(typeof(PurchaseInvoiceDto), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<ActionResult<PurchaseInvoiceDto>> GetById(int purchaseInvoiceId, CancellationToken ct)
-    {
-        var result = await _invoices.GetAsync(purchaseInvoiceId, ct);
-        if (result is null) return NotFound();
-        SetETag(result.RowVersion);
-        return Ok(result.Value);
-    }
-
-    [HttpPost]
-    [ProducesResponseType(typeof(PurchaseInvoiceDto), StatusCodes.Status201Created)]
-    [ProducesResponseType(StatusCodes.Status409Conflict)]
-    [ProducesResponseType(StatusCodes.Status422UnprocessableEntity)]
-    public async Task<ActionResult<PurchaseInvoiceDto>> Create([FromBody] CreatePurchaseInvoiceRequest request, CancellationToken ct)
-    {
-        var result = await _invoices.CreateAsync(request, ct);
-        SetETag(result.RowVersion);
-        return Created($"/api/v1/purchase-invoices/{result.Value.PurchaseInvoiceId}", result.Value);
-    }
-
-    [HttpPut("{purchaseInvoiceId:int}")]
-    [ProducesResponseType(typeof(PurchaseInvoiceDto), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [ProducesResponseType(StatusCodes.Status409Conflict)]
-    [ProducesResponseType(StatusCodes.Status412PreconditionFailed)]
-    public async Task<ActionResult<PurchaseInvoiceDto>> Update(int purchaseInvoiceId, [FromBody] UpdatePurchaseInvoiceRequest request, CancellationToken ct)
-    {
-        var expected = RequireIfMatch();
-        var result = await _invoices.UpdateAsync(purchaseInvoiceId, request, expected, ct);
-        SetETag(result.RowVersion);
-        return Ok(result.Value);
-    }
-
-    [HttpPost("{purchaseInvoiceId:int}/post")]
-    [ProducesResponseType(typeof(PurchaseInvoiceDto), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [ProducesResponseType(StatusCodes.Status409Conflict)]
-    public async Task<ActionResult<PurchaseInvoiceDto>> Post(int purchaseInvoiceId, CancellationToken ct)
-        => Ok(await _invoices.PostAsync(purchaseInvoiceId, ct));
-
-    [HttpPost("{purchaseInvoiceId:int}/cancel")]
-    [ProducesResponseType(typeof(PurchaseInvoiceDto), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [ProducesResponseType(StatusCodes.Status409Conflict)]
-    public async Task<ActionResult<PurchaseInvoiceDto>> Cancel(int purchaseInvoiceId, CancellationToken ct)
-        => Ok(await _invoices.CancelAsync(purchaseInvoiceId, ct));
-
-    /// <summary>Pay the vendor against this invoice's balance, in full or in installments; posts a real GL journal entry.</summary>
-    [HttpPost("{purchaseInvoiceId:int}/payments")]
-    [ProducesResponseType(typeof(PurchaseInvoicePaymentDto), StatusCodes.Status201Created)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [ProducesResponseType(StatusCodes.Status409Conflict)]
-    public async Task<ActionResult<PurchaseInvoicePaymentDto>> Pay(int purchaseInvoiceId, [FromBody] CreatePurchaseInvoicePaymentRequest request, CancellationToken ct)
-    {
-        var dto = await _payments.PayAsync(purchaseInvoiceId, request, ct);
-        return Created($"/api/v1/purchase-invoices/{purchaseInvoiceId}/payments/{dto.PurchaseInvoicePaymentId}", dto);
-    }
-
-    /// <summary>Payment history for this invoice, newest first.</summary>
-    [HttpGet("{purchaseInvoiceId:int}/payments")]
-    [ProducesResponseType(typeof(IReadOnlyList<PurchaseInvoicePaymentDto>), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<ActionResult<IReadOnlyList<PurchaseInvoicePaymentDto>>> ListPayments(int purchaseInvoiceId, CancellationToken ct)
-        => Ok(await _payments.ListAsync(purchaseInvoiceId, ct));
-}
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Domain.Enums;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Procurement;
@@ -10,7 +8,6 @@ namespace ERPCore.Controllers;

 /// <summary>Purchase-order endpoints (docs/11 §3.3).</summary>
 [Route("api/v1/purchase-orders")]
-[Authorize(Policy = NavPolicies.Prefix + "procurement")]
 public sealed class PurchaseOrdersController : ApiControllerBase
 {
    private readonly IPurchaseOrderService _pos;
@@ -35,7 +32,7 @@ public sealed class PurchaseOrdersController : ApiControllerBase
        return Ok(result.Value);
    }

-    /// <summary>Create a PO — non-draft is issued straight into PendingApproval (FR-PROC-04). Totals computed server-side.</summary>
+    /// <summary>Create a PO — auto-approved on creation in Phase 1 (FR-PROC-04). Totals computed server-side.</summary>
    [HttpPost]
    [ProducesResponseType(typeof(PurchaseOrderDto), StatusCodes.Status201Created)]
    [ProducesResponseType(StatusCodes.Status422UnprocessableEntity)]
@@ -60,7 +57,7 @@ public sealed class PurchaseOrdersController : ApiControllerBase
        return Ok(result.Value);
    }

-    /// <summary>Submit a Draft PO (Draft → PendingApproval). 409 PO_NOT_EDITABLE if not Draft.</summary>
+    /// <summary>Submit a Draft PO (Draft → Approved). 409 PO_NOT_EDITABLE if not Draft.</summary>
    [HttpPost("{poId:int}/submit")]
    [ProducesResponseType(typeof(PurchaseOrderDto), StatusCodes.Status200OK)]
    [ProducesResponseType(StatusCodes.Status404NotFound)]
@@ -70,7 +67,6 @@ public sealed class PurchaseOrdersController : ApiControllerBase

    /// <summary>Delete a PO — permitted only while Draft (409 PO_NOT_EDITABLE otherwise).</summary>
    [HttpDelete("{poId:int}")]
-    [Authorize(Policy = NavPolicies.Prefix + "procurement" + NavPolicies.ActionSeparator + NavPolicies.DeleteAction)]
    [ProducesResponseType(StatusCodes.Status204NoContent)]
    [ProducesResponseType(StatusCodes.Status404NotFound)]
    [ProducesResponseType(StatusCodes.Status409Conflict)]
@@ -80,28 +76,13 @@ public sealed class PurchaseOrdersController : ApiControllerBase
        return NoContent();
    }

-    /// <summary>Approve — PendingApproval → Approved. 403 PO_APPROVAL_FORBIDDEN if the caller
-    /// isn't an Admin or is the PO's own creator; 409 PO_NOT_PENDING_APPROVAL otherwise.</summary>
+    /// <summary>Approve — no-op in Phase 1 (POs auto-approve); transitions PendingApproval→Approved when enabled.</summary>
    [HttpPost("{poId:int}/approve")]
-    [Authorize(Policy = NavPolicies.Prefix + "procurement" + NavPolicies.ActionSeparator + NavPolicies.ApproveAction)]
    [ProducesResponseType(typeof(PurchaseOrderDto), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status403Forbidden)]
    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [ProducesResponseType(StatusCodes.Status409Conflict)]
    public async Task<ActionResult<PurchaseOrderDto>> Approve(int poId, CancellationToken ct)
        => Ok(await _pos.ApproveAsync(poId, ct));

-    /// <summary>Reject — PendingApproval → Draft, so the requester can revise and resubmit.
-    /// Same caller restrictions as <see cref="Approve"/>.</summary>
-    [HttpPost("{poId:int}/reject")]
-    [Authorize(Policy = NavPolicies.Prefix + "procurement" + NavPolicies.ActionSeparator + NavPolicies.ApproveAction)]
-    [ProducesResponseType(typeof(PurchaseOrderDto), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status403Forbidden)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [ProducesResponseType(StatusCodes.Status409Conflict)]
-    public async Task<ActionResult<PurchaseOrderDto>> Reject(int poId, [FromBody] RejectPurchaseOrderRequest request, CancellationToken ct)
-        => Ok(await _pos.RejectAsync(poId, request.Reason, ct));
-
    /// <summary>Cancel — 409 if any goods have been received against the PO.</summary>
    [HttpPost("{poId:int}/cancel")]
    [ProducesResponseType(typeof(PurchaseOrderDto), StatusCodes.Status200OK)]
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Procurement;
 using ERPCore.Services.Interfaces;
@@ -9,7 +7,6 @@ namespace ERPCore.Controllers;

 /// <summary>Purchase-return endpoints (docs/11 §3.4).</summary>
 [Route("api/v1/purchase-returns")]
-[Authorize(Policy = NavPolicies.Prefix + "procurement")]
 public sealed class PurchaseReturnsController : ApiControllerBase
 {
    private readonly IPurchaseReturnService _returns;
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Domain.Enums;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Procurement;
@@ -10,7 +8,6 @@ namespace ERPCore.Controllers;

 /// <summary>Purchase-requisition endpoints (docs/11 §3.1).</summary>
 [Route("api/v1/requisitions")]
-[Authorize(Policy = NavPolicies.Prefix + "procurement")]
 public sealed class RequisitionsController : ApiControllerBase
 {
    private readonly IRequisitionService _requisitions;
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Domain.Enums;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Procurement;
@@ -10,7 +8,6 @@ namespace ERPCore.Controllers;

 /// <summary>RFQ &amp; quotation endpoints (docs/11 §3.2).</summary>
 [Route("api/v1/rfqs")]
-[Authorize(Policy = NavPolicies.Prefix + "procurement")]
 public sealed class RfqsController : ApiControllerBase
 {
    private readonly IRfqService _rfqs;
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Domain.Enums;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Rbac;
@@ -10,7 +8,6 @@ namespace ERPCore.Controllers;

 /// <summary>Role CRUD + permission assignment (mirrors AuthHex's Role; see docs/10 C.9).</summary>
 [Route("api/v1/roles")]
-[Authorize(Policy = NavPolicies.Prefix + "settings")]
 public sealed class RolesController : ApiControllerBase
 {
    private readonly IRoleService _roles;
@@ -67,7 +64,6 @@ public sealed class RolesController : ApiControllerBase
    }

    [HttpDelete("{roleId:int}")]
-    [Authorize(Policy = NavPolicies.Prefix + "settings" + NavPolicies.ActionSeparator + NavPolicies.DeleteAction)]
    [ProducesResponseType(StatusCodes.Status204NoContent)]
    [ProducesResponseType(StatusCodes.Status404NotFound)]
    [ProducesResponseType(StatusCodes.Status409Conflict)]
@@ -1,46 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
-using ERPCore.Dtos.Config;
-using ERPCore.Services.Interfaces;
-using Microsoft.AspNetCore.Mvc;
-
-namespace ERPCore.Controllers;
-
-/// <summary>
-/// Sales configuration endpoints — the singleton "allow cash customer" toggle.
-/// <para>
-/// <b>Authorization:</b> gated on the Sales nav policy (the New Sale form has to read it), same
-/// Phase-1 posture as <see cref="BranchConfigController"/> — any Sales user can flip the flag
-/// until per-endpoint RBAC lands.
-/// </para>
-/// </summary>
-[Route("api/v1/sales-config")]
-[Authorize(Policy = NavPolicies.Prefix + "sales")]
-public sealed class SalesConfigController : ApiControllerBase
-{
-    private readonly ISalesConfigService _config;
-
-    public SalesConfigController(ISalesConfigService config) => _config = config;
-
-    [HttpGet]
-    [ProducesResponseType(typeof(SalesConfigDto), StatusCodes.Status200OK)]
-    public async Task<ActionResult<SalesConfigDto>> Get(CancellationToken ct)
-    {
-        var result = await _config.GetAsync(ct);
-        SetETag(result.RowVersion);
-        return Ok(result.Value);
-    }
-
-    [HttpPut]
-    [ProducesResponseType(typeof(SalesConfigDto), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status412PreconditionFailed)]
-    public async Task<ActionResult<SalesConfigDto>> Update(
-        [FromBody] UpdateSalesConfigRequest request, CancellationToken ct)
-    {
-        var expected = RequireIfMatch();
-        var result = await _config.UpdateAsync(request, expected, ct);
-        SetETag(result.RowVersion);
-        return Ok(result.Value);
-    }
-}
@@ -1,53 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
-using ERPCore.Dtos.Common;
-using ERPCore.Dtos.Sales;
-using ERPCore.Services.Interfaces;
-using Microsoft.AspNetCore.Mvc;
-
-namespace ERPCore.Controllers;
-
-/// <summary>Cashier day-end close-out — locks a cashier's Posted sales slips for a business
-/// date and posts one consolidated GL journal entry for the day (docs/14 Sales API).</summary>
-[Route("api/v1/sales-day-end")]
-[Authorize(Policy = NavPolicies.Prefix + "sales")]
-public sealed class SalesDayEndController : ApiControllerBase
-{
-    private readonly ISalesDayEndService _dayEnds;
-
-    public SalesDayEndController(ISalesDayEndService dayEnds) => _dayEnds = dayEnds;
-
-    /// <summary>List day-end closes, newest first.</summary>
-    [HttpGet]
-    [ProducesResponseType(typeof(PagedResponse<SalesDayEndSummaryDto>), StatusCodes.Status200OK)]
-    public async Task<ActionResult<PagedResponse<SalesDayEndSummaryDto>>> List(
-        [FromQuery] PageQuery query, [FromQuery] int? cashierUserId, CancellationToken ct)
-        => Ok(await _dayEnds.ListAsync(query, cashierUserId, ct));
-
-    /// <summary>What closing this cashier/date right now would include (or the existing close's totals, if already closed).</summary>
-    [HttpGet("preview")]
-    [ProducesResponseType(typeof(SalesDayEndPreviewDto), StatusCodes.Status200OK)]
-    public async Task<ActionResult<SalesDayEndPreviewDto>> Preview(
-        [FromQuery] int cashierUserId, [FromQuery] DateOnly? businessDate, CancellationToken ct)
-        => Ok(await _dayEnds.PreviewAsync(cashierUserId, businessDate ?? DateOnly.FromDateTime(DateTime.UtcNow), ct));
-
-    [HttpGet("{salesDayEndId:int}")]
-    [ProducesResponseType(typeof(SalesDayEndDto), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<ActionResult<SalesDayEndDto>> GetById(int salesDayEndId, CancellationToken ct)
-    {
-        var dto = await _dayEnds.GetAsync(salesDayEndId, ct);
-        return dto is null ? NotFound() : Ok(dto);
-    }
-
-    /// <summary>Close the day: lock every Posted slip for (CashierUserId, BusinessDate) and post the
-    /// consolidated GL journal entry. Idempotent — closing an already-closed date replays it.</summary>
-    [HttpPost]
-    [ProducesResponseType(typeof(SalesDayEndDto), StatusCodes.Status201Created)]
-    [ProducesResponseType(StatusCodes.Status409Conflict)]
-    public async Task<ActionResult<SalesDayEndDto>> Close([FromBody] CreateSalesDayEndRequest request, CancellationToken ct)
-    {
-        var dto = await _dayEnds.CloseAsync(request, ct);
-        return Created($"/api/v1/sales-day-end/{dto.SalesDayEndId}", dto);
-    }
-}
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Domain.Enums;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Sales;
@@ -9,76 +7,11 @@ using Microsoft.AspNetCore.Mvc;
 namespace ERPCore.Controllers;

 [Route("api/v1/sales-invoices")]
-[Authorize(Policy = NavPolicies.Prefix + "sales")]
 public sealed class SalesInvoicesController : ApiControllerBase
 {
    private readonly ISalesInvoiceService _invoices;
-    private readonly ISalesInvoicePaymentService _payments;
-    private readonly ISalesPricingService _pricing;
-    private readonly ISalesDomainService _sales;
-    private readonly IStockService _stock;

-    public SalesInvoicesController(
-        ISalesInvoiceService invoices, ISalesInvoicePaymentService payments, ISalesPricingService pricing,
-        ISalesDomainService sales, IStockService stock)
-    {
-        _invoices = invoices;
-        _payments = payments;
-        _pricing = pricing;
-        _sales = sales;
-        _stock = stock;
-    }
-
-    // Lets the New Sale form warn, per line, when qty exceeds the stock a sale can issue — under
-    // the "sales" policy, since sales users may not hold the "stock" nav permission. Non-stocked
-    // items (services) are never short, so they report IsStocked = false and no limit.
-    [HttpGet("stock-availability")]
-    [ProducesResponseType(typeof(SalesStockAvailabilityDto), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<ActionResult<SalesStockAvailabilityDto>> StockAvailability(
-        [FromQuery] int itemId, [FromQuery] int warehouseId, CancellationToken ct)
-    {
-        bool isStocked;
-        try
-        {
-            isStocked = await _sales.IsStockedItemAsync(itemId, ct);
-        }
-        catch (InvalidOperationException)
-        {
-            return NotFound();
-        }
-        var available = isStocked ? (await _stock.GetOnHandAsync(itemId, warehouseId, ct)).Available : 0m;
-        return Ok(new SalesStockAvailabilityDto(itemId, warehouseId, isStocked, available));
-    }
-
-    // Feeds New Sale's "Add item" dropdown with each item's issuable stock at the sale's warehouse.
-    // Under "sales" for the same reason as above; items absent from the list have no stock there.
-    [HttpGet("stock-summary")]
-    [ProducesResponseType(typeof(IReadOnlyList<SalesItemStockDto>), StatusCodes.Status200OK)]
-    public async Task<ActionResult<IReadOnlyList<SalesItemStockDto>>> StockSummary([FromQuery] int warehouseId, CancellationToken ct)
-    {
-        var available = await _stock.GetAvailableByItemAsync(warehouseId, ct);
-        return Ok(available.Select(kv => new SalesItemStockDto(kv.Key, kv.Value)).ToList());
-    }
-
-    // Lets the New Sale form pre-fill Unit price for items with no flat selling price, using the
-    // same resolution the server applies on save.
-    [HttpGet("suggested-price")]
-    [ProducesResponseType(typeof(SalesSuggestedPriceDto), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<ActionResult<SalesSuggestedPriceDto>> SuggestedPrice(
-        [FromQuery] int itemId, [FromQuery] int warehouseId, CancellationToken ct)
-    {
-        try
-        {
-            var price = await _pricing.ResolveAsync(itemId, warehouseId, null, false, ct);
-            return Ok(new SalesSuggestedPriceDto(itemId, warehouseId, price.UnitPrice, price.PriceSource));
-        }
-        catch (InvalidOperationException)
-        {
-            return NotFound();
-        }
-    }
+    public SalesInvoicesController(ISalesInvoiceService invoices) => _invoices = invoices;

    [HttpGet]
    [ProducesResponseType(typeof(PagedResponse<SalesInvoiceSummaryDto>), StatusCodes.Status200OK)]
@@ -87,13 +20,8 @@ public sealed class SalesInvoicesController : ApiControllerBase
        [FromQuery] SalesInvoiceStatus? status,
        [FromQuery] int? customerId,
        [FromQuery] int? warehouseId,
-        [FromQuery] int? branchId,
-        [FromQuery] DateOnly? from,
-        [FromQuery] DateOnly? to,
-        [FromQuery] int? createdBy,
-        [FromQuery] bool? paid,
        CancellationToken ct)
-        => Ok(await _invoices.ListAsync(query, status, customerId, warehouseId, branchId, from, to, createdBy, paid, ct));
+        => Ok(await _invoices.ListAsync(query, status, customerId, warehouseId, ct));

    [HttpGet("{salesInvoiceId:int}")]
    [ProducesResponseType(typeof(SalesInvoiceDto), StatusCodes.Status200OK)]
@@ -142,35 +70,4 @@ public sealed class SalesInvoicesController : ApiControllerBase
    [ProducesResponseType(typeof(SalesInvoiceDto), StatusCodes.Status200OK)]
    public async Task<ActionResult<SalesInvoiceDto>> Cancel(int salesInvoiceId, CancellationToken ct)
        => Ok(await _invoices.CancelAsync(salesInvoiceId, ct));
-
-    /// <summary>Pay the customer's balance against this invoice, in full or in installments; posts a real GL journal entry.</summary>
-    [HttpPost("{salesInvoiceId:int}/payments")]
-    [ProducesResponseType(typeof(SalesInvoicePaymentDto), StatusCodes.Status201Created)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [ProducesResponseType(StatusCodes.Status409Conflict)]
-    public async Task<ActionResult<SalesInvoicePaymentDto>> Pay(int salesInvoiceId, [FromBody] CreateSalesInvoicePaymentRequest request, CancellationToken ct)
-    {
-        var dto = await _payments.PayAsync(salesInvoiceId, request, ct);
-        return Created($"/api/v1/sales-invoices/{salesInvoiceId}/payments/{dto.SalesInvoicePaymentId}", dto);
-    }
-
-    /// <summary>
-    /// Pay several Posted invoices of one (non-cash) customer at once, split across payment lines;
-    /// applied oldest invoice first under a single GL journal entry. Returns one payment per split.
-    /// </summary>
-    [HttpPost("payments/bulk")]
-    [ProducesResponseType(typeof(IReadOnlyList<SalesInvoicePaymentDto>), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [ProducesResponseType(StatusCodes.Status409Conflict)]
-    public async Task<ActionResult<IReadOnlyList<SalesInvoicePaymentDto>>> PayBulk([FromBody] CreateBulkSalesInvoicePaymentRequest request, CancellationToken ct)
-        => Ok(await _payments.PayBulkAsync(request, ct));
-
-    /// <summary>Payment history for this invoice, newest first.</summary>
-    [HttpGet("{salesInvoiceId:int}/payments")]
-    [ProducesResponseType(typeof(IReadOnlyList<SalesInvoicePaymentDto>), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<ActionResult<IReadOnlyList<SalesInvoicePaymentDto>>> ListPayments(int salesInvoiceId, CancellationToken ct)
-        => Ok(await _payments.ListAsync(salesInvoiceId, ct));
 }
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Dtos.Sales;
 using ERPCore.Services.Interfaces;
 using Microsoft.AspNetCore.Mvc;
@@ -7,7 +5,6 @@ using Microsoft.AspNetCore.Mvc;
 namespace ERPCore.Controllers;

 [Route("api/v1/reports/sales")]
-[Authorize(Policy = NavPolicies.Prefix + "sales")]
 public sealed class SalesReportsController : ApiControllerBase
 {
    private readonly ISalesReportService _reports;
@@ -1,52 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
-using ERPCore.Dtos.Common;
-using ERPCore.Dtos.Sales;
-using ERPCore.Services.Interfaces;
-using Microsoft.AspNetCore.Mvc;
-
-namespace ERPCore.Controllers;
-
-/// <summary>Sales-return endpoints — customer returns of previously sold goods.</summary>
-[Route("api/v1/sales-returns")]
-[Authorize(Policy = NavPolicies.Prefix + "sales")]
-public sealed class SalesReturnsController : ApiControllerBase
-{
-    private readonly ISalesReturnService _returns;
-
-    public SalesReturnsController(ISalesReturnService returns) => _returns = returns;
-
-    /// <summary>List posted returns, newest first.</summary>
-    [HttpGet]
-    [ProducesResponseType(typeof(PagedResponse<SalesReturnSummaryDto>), StatusCodes.Status200OK)]
-    public async Task<ActionResult<PagedResponse<SalesReturnSummaryDto>>> List(
-        [FromQuery] PageQuery query, [FromQuery] int? customerId, [FromQuery] int? warehouseId, CancellationToken ct)
-        => Ok(await _returns.ListAsync(query, customerId, warehouseId, ct));
-
-    /// <summary>Remaining returnable qty per line of one sales invoice (invoiced qty minus already-returned).</summary>
-    [HttpGet("remaining")]
-    [ProducesResponseType(typeof(IReadOnlyList<SalesInvoiceLineRemainingDto>), StatusCodes.Status200OK)]
-    public async Task<ActionResult<IReadOnlyList<SalesInvoiceLineRemainingDto>>> GetRemaining([FromQuery] int salesInvoiceId, CancellationToken ct)
-        => Ok(await _returns.GetRemainingByInvoiceAsync(salesInvoiceId, ct));
-
-    /// <summary>Get one return with its lines and the ledger entries it posted.</summary>
-    [HttpGet("{returnId:int}")]
-    [ProducesResponseType(typeof(SalesReturnDto), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<ActionResult<SalesReturnDto>> GetById(int returnId, CancellationToken ct)
-    {
-        var dto = await _returns.GetAsync(returnId, ct);
-        return dto is null ? NotFound() : Ok(dto);
-    }
-
-    /// <summary>Create + auto-post a return (inbound movement).</summary>
-    [HttpPost]
-    [ProducesResponseType(typeof(SalesReturnDto), StatusCodes.Status201Created)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status422UnprocessableEntity)]
-    public async Task<ActionResult<SalesReturnDto>> Create([FromBody] CreateSalesReturnRequest request, CancellationToken ct)
-    {
-        var dto = await _returns.CreateAsync(request, ct);
-        return Created($"/api/v1/sales-returns/{dto.ReturnId}", dto);
-    }
-}
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Dtos.Sales;
 using ERPCore.Services.Interfaces;
 using Microsoft.AspNetCore.Mvc;
@@ -7,7 +5,6 @@ using Microsoft.AspNetCore.Mvc;
 namespace ERPCore.Controllers;

 [Route("api/v1/sales-slips/{salesSlipId:int}/free-issue-suggestions")]
-[Authorize(Policy = NavPolicies.Prefix + "sales")]
 public sealed class SalesSlipPromotionsController : ApiControllerBase
 {
    private readonly ISalesPromotionSuggestionService _suggestions;
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Domain.Enums;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Sales;
@@ -9,7 +7,6 @@ using Microsoft.AspNetCore.Mvc;
 namespace ERPCore.Controllers;

 [Route("api/v1/sales-slips")]
-[Authorize(Policy = NavPolicies.Prefix + "sales")]
 public sealed class SalesSlipsController : ApiControllerBase
 {
    private readonly ISalesSlipService _slips;
@@ -1,20 +0,0 @@
-using ERPCore.Dtos.Search;
-using ERPCore.Services.Interfaces;
-using Microsoft.AspNetCore.Mvc;
-
-namespace ERPCore.Controllers;
-
-[Route("api/v1/search")]
-public sealed class SearchController : ApiControllerBase
-{
-    private readonly IGlobalSearchService _search;
-
-    public SearchController(IGlobalSearchService search) => _search = search;
-
-    [HttpGet]
-    public async Task<ActionResult<IReadOnlyList<GlobalSearchResultDto>>> Get([FromQuery] string q, CancellationToken ct)
-    {
-        var results = await _search.SearchAsync(q, 6, ct);
-        return Ok(results);
-    }
-}
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Stock;
 using ERPCore.Services.Interfaces;
@@ -9,7 +7,6 @@ namespace ERPCore.Controllers;

 /// <summary>Stock-adjustment endpoints (docs/11 §5.5).</summary>
 [Route("api/v1/stock-adjustments")]
-[Authorize(Policy = NavPolicies.Prefix + "stock")]
 public sealed class StockAdjustmentsController : ApiControllerBase
 {
    private readonly IAdjustmentService _adjustments;
@@ -20,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? branchId, [FromQuery] int? reasonCodeId, CancellationToken ct)
-        => Ok(await _adjustments.ListAsync(query, warehouseId, branchId, reasonCodeId, ct));
+        [FromQuery] PageQuery query, [FromQuery] int? warehouseId, [FromQuery] int? reasonCodeId, CancellationToken ct)
+        => Ok(await _adjustments.ListAsync(query, warehouseId, reasonCodeId, ct));

    /// <summary>Get one adjustment with its lines and the ledger entries it posted.</summary>
    [HttpGet("{adjustmentId:int}")]
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Procurement;
 using ERPCore.Dtos.Stock;
@@ -10,7 +8,6 @@ namespace ERPCore.Controllers;

 /// <summary>Stock enquiry, ledger, valuation and reorder-alert endpoints (docs/11 §5.1–5.3, §5.7).</summary>
 [Route("api/v1/stock")]
-[Authorize(Policy = NavPolicies.Prefix + "stock")]
 public sealed class StockController : ApiControllerBase
 {
    private readonly IStockService _stock;
@@ -31,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] int? branchId, [FromQuery] PageQuery query, CancellationToken ct)
-        => Ok(await _stock.GetOnHandListAsync(itemId, warehouseId, branchId, query, ct));
+        [FromQuery] int? itemId, [FromQuery] int? warehouseId, [FromQuery] PageQuery query, CancellationToken ct)
+        => Ok(await _stock.GetOnHandListAsync(itemId, warehouseId, query, ct));

    /// <summary>
    /// Immutable movement history. <c>sourceDocType</c>/<c>sourceDocId</c> answer "what did
@@ -42,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? branchId,
+        [FromQuery] int? itemId, [FromQuery] int? warehouseId,
        [FromQuery] DateOnly? from, [FromQuery] DateOnly? to,
        [FromQuery] string? sourceDocType, [FromQuery] int? sourceDocId,
        [FromQuery] PageQuery query, CancellationToken ct)
-        => Ok(await _stock.GetLedgerAsync(itemId, warehouseId, branchId, from, to, sourceDocType, sourceDocId, query, ct));
+        => Ok(await _stock.GetLedgerAsync(itemId, warehouseId, from, to, sourceDocType, sourceDocId, query, ct));

    [HttpGet("valuation")]
    [ProducesResponseType(typeof(StockValuationDto), StatusCodes.Status200OK)]
@@ -57,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] int? branchId, [FromQuery] PageQuery query, CancellationToken ct)
-        => Ok(await _reorder.GetAlertsAsync(warehouseId, branchId, query, ct));
+        [FromQuery] int? warehouseId, [FromQuery] PageQuery query, CancellationToken ct)
+        => Ok(await _reorder.GetAlertsAsync(warehouseId, query, ct));

    /// <summary>Create a draft requisition for an item's suggested reorder quantity.</summary>
    [HttpPost("reorder-alerts/{itemId:int}/requisition")]
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Domain.Enums;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Stock;
@@ -10,7 +8,6 @@ namespace ERPCore.Controllers;

 /// <summary>Stock-count endpoints (docs/11 §5.6).</summary>
 [Route("api/v1/stock-counts")]
-[Authorize(Policy = NavPolicies.Prefix + "stock")]
 public sealed class StockCountsController : ApiControllerBase
 {
    private readonly ICountService _counts;
@@ -21,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, [FromQuery] int? branchId, CancellationToken ct)
-        => Ok(await _counts.ListAsync(query, status, warehouseId, branchId, ct));
+        [FromQuery] PageQuery query, [FromQuery] CountStatus? status, [FromQuery] int? warehouseId, CancellationToken ct)
+        => Ok(await _counts.ListAsync(query, status, warehouseId, ct));

    [HttpGet("{countId:int}")]
    [ProducesResponseType(typeof(CountDto), StatusCodes.Status200OK)]
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Domain.Enums;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Stock;
@@ -10,7 +8,6 @@ namespace ERPCore.Controllers;

 /// <summary>Stock-transfer endpoints (docs/11 §5.4).</summary>
 [Route("api/v1/stock-transfers")]
-[Authorize(Policy = NavPolicies.Prefix + "stock")]
 public sealed class StockTransfersController : ApiControllerBase
 {
    private readonly ITransferService _transfers;
@@ -22,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, [FromQuery] int? branchId, CancellationToken ct)
-        => Ok(await _transfers.ListAsync(query, status, srcWarehouseId, destWarehouseId, branchId, ct));
+        [FromQuery] int? srcWarehouseId, [FromQuery] int? destWarehouseId, CancellationToken ct)
+        => Ok(await _transfers.ListAsync(query, status, srcWarehouseId, destWarehouseId, ct));

    [HttpGet("{transferId:int}")]
    [ProducesResponseType(typeof(TransferDto), StatusCodes.Status200OK)]
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Dtos.Categories;
 using ERPCore.Services.Interfaces;
 using Microsoft.AspNetCore.Mvc;
@@ -12,7 +10,6 @@ namespace ERPCore.Controllers;
 /// since a subcategory only exists in the context of one.
 /// </summary>
 [Route("api/v1/subcategories")]
-[Authorize(Policy = NavPolicies.Prefix + "products")]
 public sealed class SubCategoriesController : ApiControllerBase
 {
    private readonly ICategoryService _categories;
@@ -1,70 +0,0 @@
-using ERPCore.Dtos.Support;
-using ERPCore.Infra.Auth;
-using ERPCore.Services.Interfaces;
-using Microsoft.AspNetCore.Mvc;
-
-namespace ERPCore.Controllers;
-
-[Route("api/v1/support-tickets")]
-public sealed class SupportTicketsController : ApiControllerBase
-{
-    private readonly ISupportTicketService _tickets;
-    private readonly ICurrentUser _currentUser;
-
-    public SupportTicketsController(ISupportTicketService tickets, ICurrentUser currentUser)
-    {
-        _tickets = tickets;
-        _currentUser = currentUser;
-    }
-
-    [HttpPost]
-    [ProducesResponseType(typeof(SupportTicketDto), StatusCodes.Status201Created)]
-    public async Task<ActionResult<SupportTicketDto>> Create([FromBody] CreateSupportTicketRequest request, CancellationToken ct)
-    {
-        var result = await _tickets.CreateAsync(_currentUser.AuditUserId, request, ct);
-        SetETag(result.RowVersion);
-        return CreatedAtAction(nameof(GetById), new { id = result.Value.TicketId }, result.Value);
-    }
-
-    [HttpGet]
-    [ProducesResponseType(typeof(IReadOnlyList<SupportTicketSummaryDto>), StatusCodes.Status200OK)]
-    public async Task<ActionResult<IReadOnlyList<SupportTicketSummaryDto>>> GetList(CancellationToken ct)
-    {
-        var list = await _tickets.GetListAsync(_currentUser.AuditUserId, _currentUser.IsAdmin, ct);
-        return Ok(list);
-    }
-
-    [HttpGet("{id:int}")]
-    [ProducesResponseType(typeof(SupportTicketDto), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<ActionResult<SupportTicketDto>> GetById(int id, CancellationToken ct)
-    {
-        var result = await _tickets.GetByIdAsync(id, _currentUser.AuditUserId, _currentUser.IsAdmin, ct);
-        SetETag(result.RowVersion);
-        return Ok(result.Value);
-    }
-
-    [HttpPost("{id:int}/messages")]
-    [ProducesResponseType(typeof(SupportTicketDto), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [ProducesResponseType(StatusCodes.Status412PreconditionFailed)]
-    public async Task<ActionResult<SupportTicketDto>> AddMessage(int id, [FromBody] AddSupportTicketMessageRequest request, CancellationToken ct)
-    {
-        var expected = RequireIfMatch();
-        var result = await _tickets.AddMessageAsync(id, _currentUser.AuditUserId, _currentUser.IsAdmin, request, expected, ct);
-        SetETag(result.RowVersion);
-        return Ok(result.Value);
-    }
-
-    [HttpPut("{id:int}/status")]
-    [ProducesResponseType(typeof(SupportTicketDto), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [ProducesResponseType(StatusCodes.Status412PreconditionFailed)]
-    public async Task<ActionResult<SupportTicketDto>> UpdateStatus(int id, [FromBody] UpdateSupportTicketStatusRequest request, CancellationToken ct)
-    {
-        var expected = RequireIfMatch();
-        var result = await _tickets.UpdateStatusAsync(id, _currentUser.AuditUserId, _currentUser.IsAdmin, request, expected, ct);
-        SetETag(result.RowVersion);
-        return Ok(result.Value);
-    }
-}
@@ -1,70 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
-using ERPCore.Domain.Enums;
-using ERPCore.Dtos.Common;
-using ERPCore.Dtos.TaxRates;
-using ERPCore.Services.Interfaces;
-using Microsoft.AspNetCore.Mvc;
-
-namespace ERPCore.Controllers;
-
-/// <summary>Tax rate master endpoints — see <see cref="Domain.Entities.TaxRate"/>.</summary>
-[Route("api/v1/tax-rates")]
-[Authorize(Policy = NavPolicies.Prefix + "products")]
-public sealed class TaxRatesController : ApiControllerBase
-{
-    private readonly ITaxRateService _taxRates;
-
-    public TaxRatesController(ITaxRateService taxRates) => _taxRates = taxRates;
-
-    [HttpGet]
-    [ProducesResponseType(typeof(PagedResponse<TaxRateDto>), StatusCodes.Status200OK)]
-    public async Task<ActionResult<PagedResponse<TaxRateDto>>> List(
-        [FromQuery] PageQuery query, [FromQuery] EntityStatus? status, CancellationToken ct)
-        => Ok(await _taxRates.ListAsync(query, status, ct));
-
-    [HttpGet("{taxRateId:int}")]
-    [ProducesResponseType(typeof(TaxRateDto), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<ActionResult<TaxRateDto>> GetById(int taxRateId, CancellationToken ct)
-    {
-        var result = await _taxRates.GetAsync(taxRateId, ct);
-        if (result is null) return NotFound();
-
-        SetETag(result.RowVersion);
-        return Ok(result.Value);
-    }
-
-    [HttpPost]
-    [ProducesResponseType(typeof(TaxRateDto), StatusCodes.Status201Created)]
-    [ProducesResponseType(StatusCodes.Status409Conflict)]
-    public async Task<ActionResult<TaxRateDto>> Create([FromBody] CreateTaxRateRequest request, CancellationToken ct)
-    {
-        var result = await _taxRates.CreateAsync(request, ct);
-        SetETag(result.RowVersion);
-        return Created($"/api/v1/tax-rates/{result.Value.TaxRateId}", result.Value);
-    }
-
-    [HttpPut("{taxRateId:int}")]
-    [ProducesResponseType(typeof(TaxRateDto), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [ProducesResponseType(StatusCodes.Status409Conflict)]
-    [ProducesResponseType(StatusCodes.Status412PreconditionFailed)]
-    public async Task<ActionResult<TaxRateDto>> Update(int taxRateId, [FromBody] UpdateTaxRateRequest request, CancellationToken ct)
-    {
-        var expected = RequireIfMatch();
-        var result = await _taxRates.UpdateAsync(taxRateId, request, expected, ct);
-        SetETag(result.RowVersion);
-        return Ok(result.Value);
-    }
-
-    /// <summary>Deactivate/reactivate. Masters are never hard-deleted (FR-MD-08).</summary>
-    [HttpPatch("{taxRateId:int}/status")]
-    [ProducesResponseType(StatusCodes.Status204NoContent)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<IActionResult> SetStatus(int taxRateId, [FromBody] UpdateTaxRateStatusRequest request, CancellationToken ct)
-    {
-        await _taxRates.SetStatusAsync(taxRateId, request.Status, ct);
-        return NoContent();
-    }
-}
@@ -1,6 +1,3 @@
-using ERPCore.Domain.Enums;
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Uoms;
 using ERPCore.Services.Interfaces;
@@ -10,7 +7,6 @@ namespace ERPCore.Controllers;

 /// <summary>Unit-of-measure endpoints (docs/11-BACKEND-PHASE1.md §2.2).</summary>
 [Route("api/v1/uoms")]
-[Authorize(Policy = NavPolicies.Prefix + "products")]
 public sealed class UomsController : ApiControllerBase
 {
    private readonly IUomService _uoms;
@@ -19,9 +15,8 @@ public sealed class UomsController : ApiControllerBase

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

    [HttpPost]
    [ProducesResponseType(typeof(UomDto), StatusCodes.Status201Created)]
@@ -31,14 +26,4 @@ public sealed class UomsController : ApiControllerBase
        var dto = await _uoms.CreateAsync(request, ct);
        return Created($"/api/v1/uoms/{dto.UomId}", dto);
    }
-
-    /// <summary>Deactivate/reactivate. Masters are never hard-deleted (FR-MD-08).</summary>
-    [HttpPatch("{uomId:int}/status")]
-    [ProducesResponseType(StatusCodes.Status204NoContent)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<IActionResult> SetStatus(int uomId, [FromBody] UpdateUomStatusRequest request, CancellationToken ct)
-    {
-        await _uoms.SetStatusAsync(uomId, request.Status, ct);
-        return NoContent();
-    }
 }
@@ -1,13 +1,7 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Domain.Enums;
-using ERPCore.Dtos.Audit;
-using ERPCore.Dtos.Auth;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Hrm;
 using ERPCore.Dtos.Users;
-using ERPCore.Infra.Auth;
 using ERPCore.Services.Interfaces;
-using ERPCore.System.Errors;
 using Microsoft.AspNetCore.Mvc;

 namespace ERPCore.Controllers;
@@ -17,20 +11,15 @@ namespace ERPCore.Controllers;
 /// account creation orchestrated against AuthHex (see <see cref="IUserManagementService.CreateAsync"/>).
 /// </summary>
 [Route("api/v1/users")]
-[Authorize(Policy = NavPolicies.Prefix + "settings")]
 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, IAuditService audit, ICurrentUser currentUser)
+    public UsersController(IUserManagementService users, IEmployeeUserLinkService links)
    {
        _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>
@@ -41,8 +30,8 @@ public sealed class UsersController : ApiControllerBase

    [HttpGet]
    [ProducesResponseType(typeof(PagedResponse<ManagedUserDto>), StatusCodes.Status200OK)]
-    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));
+    public async Task<ActionResult<PagedResponse<ManagedUserDto>>> List([FromQuery] PageQuery query, CancellationToken ct)
+        => Ok(await _users.ListAsync(query, ct));

    /// <summary>AuthHex UserType options for the create-user form's select.</summary>
    [HttpGet("user-types")]
@@ -64,7 +53,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, _currentUser.AuditUserId, ct);
+        var result = await _users.CreateAsync(request, ct);
        return Created($"/api/v1/users/{result.UserId}", result);
    }

@@ -73,34 +62,4 @@ 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));
-
-    /// <summary>
-    /// Admin-only escape hatch: permanently deletes a stale AuthHex identity (by email/mobile/NIC/
-    /// username) that is blocking new registrations. Does not touch ERPCore's own `users` table.
-    /// See <see cref="IUserManagementService.PurgeAuthHexIdentityAsync"/>.
-    /// </summary>
-    [HttpPost("purge-authhex-identity")]
-    [ProducesResponseType(typeof(DeleteAuthHexUserResult), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status403Forbidden)]
-    public async Task<ActionResult<DeleteAuthHexUserResult>> PurgeAuthHexIdentity([FromBody] PurgeAuthHexIdentityRequest request, CancellationToken ct)
-    {
-        if (!_currentUser.IsAdmin)
-            throw new DomainException("FORBIDDEN", "Only an administrator can purge an AuthHex identity.", 403);
-
-        return Ok(await _users.PurgeAuthHexIdentityAsync(request, ct));
-    }
 }
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Domain.Enums;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Vendors;
@@ -10,7 +8,6 @@ namespace ERPCore.Controllers;

 /// <summary>Vendor master endpoints (docs/11-BACKEND-PHASE1.md §2.4).</summary>
 [Route("api/v1/vendors")]
-[Authorize(Policy = NavPolicies.Prefix + "vendors")]
 public sealed class VendorsController : ApiControllerBase
 {
    private readonly IVendorService _vendors;
@@ -1,5 +1,3 @@
-using Microsoft.AspNetCore.Authorization;
-using ERPCore.Infra.Auth;
 using ERPCore.Dtos.Common;
 using ERPCore.Dtos.Warehouses;
 using ERPCore.Services.Interfaces;
@@ -9,7 +7,6 @@ namespace ERPCore.Controllers;

 /// <summary>Warehouse &amp; bin endpoints (docs/11-BACKEND-PHASE1.md §2.5).</summary>
 [Route("api/v1/warehouses")]
-[Authorize(Policy = NavPolicies.Prefix + "warehouses")]
 public sealed class WarehousesController : ApiControllerBase
 {
    private readonly IWarehouseService _warehouses;
@@ -18,9 +15,8 @@ public sealed class WarehousesController : ApiControllerBase

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

    [HttpGet("{warehouseId:int}")]
    [ProducesResponseType(typeof(WarehouseDto), StatusCodes.Status200OK)]
@@ -40,24 +36,6 @@ public sealed class WarehousesController : ApiControllerBase
        return Created($"/api/v1/warehouses/{dto.WarehouseId}", dto);
    }

-    [HttpPut("{warehouseId:int}")]
-    [ProducesResponseType(typeof(WarehouseDto), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [ProducesResponseType(StatusCodes.Status409Conflict)]
-    public async Task<ActionResult<WarehouseDto>> Update(int warehouseId, [FromBody] UpdateWarehouseRequest request, CancellationToken ct)
-        => Ok(await _warehouses.UpdateAsync(warehouseId, request, ct));
-
-    [HttpDelete("{warehouseId:int}")]
-    [Authorize(Policy = NavPolicies.Prefix + "warehouses" + NavPolicies.ActionSeparator + NavPolicies.DeleteAction)]
-    [ProducesResponseType(StatusCodes.Status204NoContent)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [ProducesResponseType(StatusCodes.Status409Conflict)]
-    public async Task<IActionResult> Delete(int warehouseId, CancellationToken ct)
-    {
-        await _warehouses.DeleteAsync(warehouseId, ct);
-        return NoContent();
-    }
-
    [HttpGet("{warehouseId:int}/bins")]
    [ProducesResponseType(typeof(IReadOnlyList<BinDto>), StatusCodes.Status200OK)]
    [ProducesResponseType(StatusCodes.Status404NotFound)]
@@ -1,44 +0,0 @@
-using ERPCore.Domain.Enums;
-using ERPCore.Dtos.Items;
-using ERPCore.Infra.Auth;
-using ERPCore.Services.Interfaces;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace ERPCore.Controllers;
-
-/// <summary>Custom warranty period master — managed under Products like Item Variants.</summary>
-[Route("api/v1/warranty-periods")]
-[Authorize(Policy = NavPolicies.Prefix + "products")]
-public sealed class WarrantyPeriodsController : ApiControllerBase
-{
-    private readonly IWarrantyPeriodService _periods;
-
-    public WarrantyPeriodsController(IWarrantyPeriodService periods) => _periods = periods;
-
-    /// <summary>Custom periods only (defaults are fixed); filter <c>status=Active</c> for selectable rows.</summary>
-    [HttpGet]
-    [ProducesResponseType(typeof(List<WarrantyPeriodDto>), StatusCodes.Status200OK)]
-    public async Task<ActionResult<List<WarrantyPeriodDto>>> List([FromQuery] EntityStatus? status, CancellationToken ct)
-        => Ok(await _periods.ListAsync(status, ct));
-
-    [HttpPost]
-    [ProducesResponseType(typeof(WarrantyPeriodDto), StatusCodes.Status201Created)]
-    [ProducesResponseType(StatusCodes.Status409Conflict)]
-    [ProducesResponseType(StatusCodes.Status422UnprocessableEntity)]
-    public async Task<ActionResult<WarrantyPeriodDto>> Create([FromBody] CreateWarrantyPeriodRequest request, CancellationToken ct)
-    {
-        var result = await _periods.CreateAsync(request.Months!.Value, ct);
-        return Created($"/api/v1/warranty-periods/{result.WarrantyPeriodId}", result);
-    }
-
-    /// <summary>Deactivate/reactivate. Never hard-deleted (FR-MD-08).</summary>
-    [HttpPatch("{warrantyPeriodId:int}/status")]
-    [ProducesResponseType(StatusCodes.Status204NoContent)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public async Task<IActionResult> SetStatus(int warrantyPeriodId, [FromBody] UpdateWarrantyPeriodStatusRequest request, CancellationToken ct)
-    {
-        await _periods.SetStatusAsync(warrantyPeriodId, request.Status, ct);
-        return NoContent();
-    }
-}
@@ -10,7 +10,6 @@ public static class DocumentTypes
    public const string Rfq = "RFQ";
    public const string PurchaseOrder = "PO";
    public const string Grn = "GRN";
-    public const string PurchaseInvoice = "PINV";
    public const string Transfer = "TRF";
    public const string Adjustment = "ADJ";
    public const string Count = "CNT";
@@ -21,9 +20,4 @@ public static class DocumentTypes
    public const string SalesInvoice = "SI";
    public const string SalesSlip = "SSL";
    public const string BundleSale = "BND";
-    public const string BundleSaleTemplate = "TPL";
-    public const string SalesReturn = "SRET";
-
-    /// <summary>Cashier day-end close-out (Sales) — <c>DEND-2026-00001</c>.</summary>
-    public const string SalesDayEnd = "DEND";
 }
@@ -13,7 +13,4 @@ public class Batch

    public string BatchNo { get; set; } = string.Empty;
    public DateOnly? ExpiryDate { get; set; }
-
-    /// <summary>Optional scan code for barcode/RFID lookup (unique when set).</summary>
-    public string? Barcode { get; set; }
 }
@@ -3,31 +3,16 @@ using ERPCore.Domain.Enums;
 namespace ERPCore.Domain.Entities;

 /// <summary>
-/// Branch/location master (FR-HR-MD-01) — multi-branch readiness. Required by
-/// <see cref="Employee.BranchId"/>, optionally referenced by <see cref="PayrollRun.BranchId"/>.
+/// Branch/location master (FR-HR-MD-01) — multi-branch readiness. Referenced
+/// optionally by <see cref="Employee.BranchId"/> and <see cref="PayrollRun.BranchId"/>.
 /// Deactivated, not deleted, when referenced. Model: docs/12-BACKEND-HRM.md Part C.1.
 /// </summary>
 public class Branch
 {
-    /// <summary>
-    /// Code of the deployment's default branch. Every branch-scoped entity has a
-    /// non-nullable <c>BranchId</c> with a Restrict FK, so this row must exist before any
-    /// of them can be written — see <c>DataSeeder.EnsureDefaultBranchAsync</c>, which
-    /// creates it at startup, and <c>BranchConfigService.ResolveDefaultBranchIdAsync</c>,
-    /// which is the lazy runtime fallback.
-    /// </summary>
-    public const string DefaultCode = "BR-000";
-
-    /// <summary>Display name paired with <see cref="DefaultCode"/>.</summary>
-    public const string DefaultName = "Main 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; }
@@ -1,33 +0,0 @@
-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;
-
-    /// <summary>Independent sub-toggle: when the global <see cref="BranchingEnabled"/> is on
-    /// but this is off, Warehouses stop asking for/showing a branch while Employees etc.
-    /// still do. Meaningless when <see cref="BranchingEnabled"/> is off (everything is
-    /// single-branch already).</summary>
-    public bool WarehouseBranchingEnabled { 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; }
-}
@@ -27,13 +27,7 @@ public class BundleSale
    public decimal GrandTotal { get; set; }
    public DateTime CreatedAt { get; set; }
    public DateTime? UpdatedAt { get; set; }
-    public uint RowVersion { get; set; }
-
-    /// <summary>Set once this bundle's business date is closed by <see cref="SalesDayEnd"/> — a
-    /// closed bundle sale is frozen (no further edits). Same role as <see cref="SalesSlip.DayEndId"/>;
-    /// a bundle sale is a cashier document exactly like a sales slip, just priced as a set.</summary>
-    public int? DayEndId { get; set; }
-    public SalesDayEnd? DayEnd { get; set; }
+    public int ConcurrencyStamp { get; set; }

    public ICollection<BundleSaleLine> Lines { get; set; } = new List<BundleSaleLine>();
 }
@@ -12,6 +12,8 @@ public class BundleSaleLine
    public Item? Item { get; set; }
    public string Description { get; set; } = string.Empty;
    public decimal Qty { get; set; }
+    public int UomId { get; set; }
+    public Uom? Uom { get; set; }
    public int WarehouseId { get; set; }
    public Warehouse? Warehouse { get; set; }
    public decimal UnitPrice { get; set; }
@@ -11,7 +11,7 @@ public class BundleSaleTemplate
    public EntityStatus Status { get; set; } = EntityStatus.Active;
    public DateTime CreatedAt { get; set; }
    public DateTime? UpdatedAt { get; set; }
-    public uint RowVersion { get; set; }
+    public int ConcurrencyStamp { get; set; }

    public ICollection<BundleSaleTemplateLine> Lines { get; set; } = new List<BundleSaleTemplateLine>();
 }
@@ -8,6 +8,8 @@ public class BundleSaleTemplateLine

    public int ItemId { get; set; }
    public Item? Item { get; set; }
+    public int UomId { get; set; }
+    public Uom? Uom { get; set; }
    public int WarehouseId { get; set; }
    public Warehouse? Warehouse { get; set; }

@@ -29,9 +29,6 @@ public class Customer
    public int? DefaultWarehouseId { get; set; }
    public Warehouse? DefaultWarehouse { get; set; }

-    public int BranchId { get; set; }
-    public Branch? Branch { get; set; }
-
    public EntityStatus Status { get; set; } = EntityStatus.Active;
    public DateTime CreatedAt { get; set; }
    public DateTime? UpdatedAt { get; set; }
@@ -6,10 +6,8 @@ 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). 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.
+/// 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"/>.
 /// <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".
@@ -52,7 +50,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,11 +22,6 @@ 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; }
@@ -35,16 +30,6 @@ public class Grn
    public DateTime CreatedAt { get; set; }
    public DateTime? PostedAt { get; set; }

-    /// <summary>Journal number of the real GL journal entry posted for this GRN's receipt (set on confirm).</summary>
-    public string? GlJournalNo { get; set; }
-    public DateTime? GlPostedAt { get; set; }
-
-    /// <summary>The Purchase Invoice this GRN has been consolidated into, if any (null until
-    /// invoiced). Vendor settlement is tracked on the invoice, not per-GRN — see
-    /// <see cref="PurchaseInvoice"/>.</summary>
-    public int? PurchaseInvoiceId { get; set; }
-    public PurchaseInvoice? PurchaseInvoice { get; set; }
-
    /// <summary>PostgreSQL xmin-backed optimistic concurrency token.</summary>
    public uint RowVersion { get; set; }

@@ -1,41 +0,0 @@
-namespace ERPCore.Domain.Entities;
-
-/// <summary>
-/// GRN (goods receipt) configuration — a singleton row, same shape as <see cref="SalesConfig"/>.
-/// Controls which warehouse goods are received into.
-/// </summary>
-public class GrnConfig
-{
-    /// <summary>Always 1 - the singleton row's id.</summary>
-    public const int SingletonId = 1;
-
-    public int ConfigId { get; set; }
-
-    /// <summary>When on (default) and no <see cref="DefaultWarehouseId"/> is saved, New GRN shows
-    /// a Warehouse picker. When off, a default must be saved.</summary>
-    public bool AllowWarehouseSelection { get; set; } = true;
-
-    /// <summary>Default receiving warehouse. Whenever set, New GRN shows only this warehouse (locked)
-    /// and every GRN is forced onto it server-side (see GrnConfigService.GetForcedWarehouseIdAsync).
-    /// Required while <see cref="AllowWarehouseSelection"/> is off; clearing it brings the picker back.</summary>
-    public int? DefaultWarehouseId { get; set; }
-    public Warehouse? DefaultWarehouse { get; set; }
-
-    /// <summary>When on (default), GRN lines may carry a discount % (the New GRN "Disc %" column and
-    /// header rate); when off, they are hidden and a discount above zero is rejected server-side
-    /// (see GrnService.CreateAsync).</summary>
-    public bool AllowDiscounts { get; set; } = true;
-
-    /// <summary>When on (default), GRN lines carry VAT (entered, or the item's tax rate when left
-    /// empty); when off, the VAT columns are hidden, every line is received at 0% VAT, and a VAT
-    /// above zero is rejected server-side (see GrnService.CreateAsync).</summary>
-    public bool AllowVat { 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; }
-}
@@ -25,6 +25,9 @@ public class GrnLine
    public int ItemId { get; set; }
    public Item? Item { get; set; }

+    public int UomId { get; set; }
+    public Uom? Uom { get; set; }
+
    public int? BinId { get; set; }
    public Bin? Bin { get; set; }

@@ -58,11 +61,4 @@ public class GrnLine
    public decimal LineTotal { get; set; }

    public HoldStatus HoldStatus { get; set; } = HoldStatus.Available;
-
-    /// <summary>
-    /// One row per received unit when <see cref="Item.Warranty"/> is
-    /// <see cref="Enums.Warranty.Warranty"/> — count must equal <see cref="Qty"/>.
-    /// Empty for a non-warranty item.
-    /// </summary>
-    public ICollection<GrnLineWarrantyNumber> WarrantyNumbers { get; set; } = new List<GrnLineWarrantyNumber>();
 }
@@ -1,20 +0,0 @@
-namespace ERPCore.Domain.Entities;
-
-/// <summary>
-/// One warranty number captured against a single received unit of a warranty-tracked
-/// item (<see cref="Item.Warranty"/> = <see cref="Enums.Warranty.Warranty"/>). A GRN line
-/// for such an item must carry exactly <see cref="GrnLine.Qty"/> of these — one per unit —
-/// mirroring how a Serial-tracked item requires one serial per unit (docs/10 Part C.3).
-/// </summary>
-public class GrnLineWarrantyNumber
-{
-    public int GrnLineWarrantyNumberId { get; set; }
-
-    public int GrnLineId { get; set; }
-    public GrnLine? GrnLine { get; set; }
-
-    public string WarrantyNo { get; set; } = string.Empty;
-
-    /// <summary>Warranty coverage length in months, selected at receipt (e.g. 3/6/12/18).</summary>
-    public int WarrantyPeriodMonths { get; set; }
-}
@@ -14,9 +14,6 @@ public class Item
    public string Name { get; set; } = string.Empty;
    public string? Description { get; set; }

-    /// <summary>Optional scan code for barcode/RFID lookup (unique when set).</summary>
-    public string? Barcode { get; set; }
-
    public int CategoryId { get; set; }
    public Category? Category { get; set; }

@@ -27,12 +24,6 @@ public class Item
    public int? BrandId { get; set; }
    public Brand? Brand { get; set; }

-    /// <summary>
-    /// The stocking unit — the pack the item is counted in (BOTTLE, PACKET, BOX, PCS).
-    /// <b>Every</b> quantity in the system is a count of these: stock layers, the ledger,
-    /// and every document line. Nothing converts, so this is the sole meaning of a
-    /// quantity and cannot be changed once the item has stock history.
-    /// </summary>
    public int BaseUomId { get; set; }
    public Uom? BaseUom { get; set; }

@@ -41,53 +32,14 @@ public class Item

    public StockNature StockNature { get; set; }
    public TrackingMode TrackingMode { get; set; }
-    public Warranty Warranty { get; set; } = Warranty.NonWarranty;
-    /// <summary>Coverage length in months (see <see cref="Enums.WarrantyPeriods.AllowedMonths"/>) when <see cref="Warranty"/> is Warranty; null otherwise.</summary>
-    public int? WarrantyPeriodMonths { get; set; }
+    public string? TaxClass { get; set; }

    /// <summary>
-    /// The tax rate a sales/purchase line for this item defaults to (see
-    /// <see cref="TaxRate"/>) — replaces the old free-text "tax class" label that nothing
-    /// ever read. Null means no default; a line must be given an explicit tax percentage.
+    /// Optional fixed selling price used by Sales only. <c>null</c> means "use stock value"
+    /// (the item is sold at its FIFO stock cost at sale time); a value is the fixed sale price.
+    /// Never enters costing/GRN/FIFO (docs/10 Part C.1, C.9).
    /// </summary>
-    public int? TaxRateId { get; set; }
-    public TaxRate? TaxRate { get; set; }
-
-    /// <summary>
-    /// Optional selling price range and flat price used by Sales only.
-    /// <c>null</c> values mean the field is not set. These values never enter costing/GRN/FIFO.
-    /// </summary>
-    public decimal? SellingMinPrice { get; set; }
-    public decimal? SellingMaxPrice { get; set; }
-    public decimal? SellingFlatPrice { get; set; }
-
-    /// <summary>
-    /// How much one pack holds, as the user entered it — <c>500</c> with
-    /// <see cref="ContentUnit"/> <c>Ml</c> for a 500 ml bottle, <c>1.5</c> with <c>L</c>
-    /// for a 1.5 L one. Null (together with the other three) when the item has no
-    /// measurable content: a screw, a label, a service.
-    /// <para>
-    /// Content never affects stock — that is always a pack count. It exists so production
-    /// can express a formula in millilitres or grams and resolve it to packs
-    /// (see <c>IItemMeasure</c>).
-    /// </para>
-    /// <para>
-    /// A loose bulk item bought by weight is modelled the same way:
-    /// <c>BaseUom = KG, ContentQty = 1, ContentUnit = Kg</c> ⇒ 1000 g per stocked unit.
-    /// </para>
-    /// </summary>
-    public decimal? ContentQty { get; set; }
-    public MeasureUnit? ContentUnit { get; set; }
-
-    /// <summary>
-    /// <see cref="ContentQty"/>/<see cref="ContentUnit"/> normalised to a base unit
-    /// (L→Ml, Kg→G, both ×1000) at write time by <c>ItemContent.Normalize</c>. Server-derived
-    /// and never accepted from a client. <see cref="ContentBaseUnit"/> is therefore only ever
-    /// <see cref="MeasureUnit.Ml"/> or <see cref="MeasureUnit.G"/>.
-    /// <para>Stored rather than recomputed so every consumer reads one settled number.</para>
-    /// </summary>
-    public decimal? ContentBaseQty { get; set; }
-    public MeasureUnit? ContentBaseUnit { get; set; }
+    public decimal? SalePrice { get; set; }

    public EntityStatus Status { get; set; } = EntityStatus.Active;

@@ -98,4 +50,5 @@ public class Item
    public uint RowVersion { get; set; }

    public ICollection<ItemReorder> ReorderSettings { get; set; } = new List<ItemReorder>();
+    public ICollection<UomConversion> UomConversions { get; set; } = new List<UomConversion>();
 }
@@ -1,27 +0,0 @@
-namespace ERPCore.Domain.Entities;
-
-/// <summary>
-/// A product photo attached to an item. Like <see cref="EmployeeDocument"/>, the file lives
-/// behind <see cref="Infra.Storage.IFileStorageService"/> under a server-generated name and is
-/// only reachable through the authenticated items API — never a static path. Only uploadable
-/// while <see cref="ProductConfig.ItemImagesEnabled"/> is on; existing images stay readable
-/// after the flag is switched off (reads are never gated).
-/// </summary>
-public class ItemImage
-{
-    public int ItemImageId { get; set; }
-    public int ItemId { get; set; }
-    public Item? Item { get; set; }
-
-    public string OriginalFileName { get; set; } = string.Empty;
-    public string StoredFileName { get; set; } = string.Empty;
-    public string RelativePath { get; set; } = string.Empty;
-    public string ContentType { get; set; } = string.Empty;
-    public long SizeBytes { get; set; }
-
-    /// <summary>Display order; the lowest is the item's main image.</summary>
-    public int SortOrder { get; set; }
-
-    public int UploadedBy { get; set; }
-    public DateTime UploadedAt { get; set; }
-}
@@ -7,15 +7,12 @@ namespace ERPCore.Domain.Entities;
 /// Material.
 /// <para>
 /// <b>Deliberately unlinked.</b> Nothing references this entity and it references
-/// nothing: there is no value table and no join to <see cref="Item"/>. The chosen
+/// nothing: there is no value table and no join to <see cref="Item"/>. Its only job is
+/// to feed the frontend's item-builder dropdown via <c>GET /item-types</c>. The chosen
 /// values (Red, S, M) are encoded by the client into the generated SKU
 /// (e.g. <c>BL-100-0003</c>) and are never stored or parsed server-side — the item list
 /// is the record of what was built. See the accepted trade-off in docs/10 Part C.9.
 /// </para>
-/// <para>
-/// It does, however, carry one piece of meaning the client acts on:
-/// <see cref="IsMeasurable"/>. So this is no longer purely a dropdown source.
-/// </para>
 /// Not to be confused with <see cref="Enums.StockNature"/> (Stocked/NonStocked/Service),
 /// which is what the old <c>ItemType</c> enum became.
 /// Model: docs/10-BACKEND-PHASE1.md Part C.1.
@@ -24,24 +21,6 @@ public class ItemType
 {
    public int ItemTypeId { get; set; }
    public string Name { get; set; } = string.Empty;
-
-    /// <summary>
-    /// When true, this dimension's values are content <b>measurements</b> (500 ml, 1 L) rather
-    /// than plain labels (Red, S). The item builder then captures a number + unit per value and
-    /// stamps that pair onto each generated item's <see cref="Item.ContentQty"/> /
-    /// <see cref="Item.ContentUnit"/>, instead of copying one form-level pair into every variant
-    /// — which is what makes "Coca-Cola in 500 ml / 1 L / 250 ml" three correctly sized items.
-    /// <para>
-    /// This is what lets an apparel <c>Size</c> (S/M/L) stay plain text while a
-    /// <c>Pack Size</c>/<c>Volume</c> dimension carries ml/g/L/kg.
-    /// </para>
-    /// <para>
-    /// A client hint only: the server never reads it when writing an item. Each item's pair is
-    /// still validated and normalised on its own by <c>ItemContent</c>.
-    /// </para>
-    /// </summary>
-    public bool IsMeasurable { get; set; }
-
    public EntityStatus Status { get; set; } = EntityStatus.Active;

    public DateTime CreatedAt { get; set; }
@@ -1,22 +0,0 @@
-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; }
-}
@@ -1,22 +0,0 @@
-namespace ERPCore.Domain.Entities;
-
-/// <summary>
-/// A single raised notification event (e.g. "GRN Confirmed"). Broadcast to
-/// active users via <see cref="NotificationRecipient"/> rows, gated by
-/// whether the module's InApp channel is enabled in <see cref="NotificationConfig"/>.
-/// </summary>
-public class Notification
-{
-    public int NotificationId { get; set; }
-
-    public string ModuleKey { get; set; } = string.Empty;
-    public string Title { get; set; } = string.Empty;
-    public string Message { get; set; } = string.Empty;
-
-    public string? RelatedEntityType { get; set; }
-    public int? RelatedEntityId { get; set; }
-
-    public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
-
-    public ICollection<NotificationRecipient> Recipients { get; set; } = new List<NotificationRecipient>();
-}
@@ -1,19 +0,0 @@
-namespace ERPCore.Domain.Entities;
-
-/// <summary>
-/// Notification configuration (new settings module) - singleton root row.
-/// </summary>
-public class NotificationConfig
-{
-    public const int SingletonId = 1;
-
-    public int NotificationConfigId { get; set; }
-
-    public DateTime? UpdatedAt { get; set; }
-    public int? UpdatedBy { get; set; }
-    public User? UpdatedByUser { get; set; }
-
-    public uint RowVersion { get; set; }
-
-    public ICollection<NotificationConfigModule> Modules { get; set; } = new List<NotificationConfigModule>();
-}
@@ -1,14 +0,0 @@
-namespace ERPCore.Domain.Entities;
-
-public class NotificationConfigModule
-{
-    public int NotificationConfigModuleId { get; set; }
-
-    public int NotificationConfigId { get; set; }
-    public NotificationConfig? NotificationConfig { get; set; }
-
-    public string ModuleKey { get; set; } = string.Empty;
-    public bool EmailEnabled { get; set; }
-    public bool SmsEnabled { get; set; }
-    public bool InAppEnabled { get; set; }
-}
@@ -1,18 +0,0 @@
-namespace ERPCore.Domain.Entities;
-
-/// <summary>
-/// Per-user read state for a broadcast <see cref="Notification"/>.
-/// </summary>
-public class NotificationRecipient
-{
-    public int NotificationRecipientId { get; set; }
-
-    public int NotificationId { get; set; }
-    public Notification? Notification { get; set; }
-
-    public int UserId { get; set; }
-    public User? User { get; set; }
-
-    public bool IsRead { get; set; }
-    public DateTime? ReadAt { get; set; }
-}
@@ -10,10 +10,6 @@ public class NumberSequence
 {
    public int SequenceId { get; set; }
    public string DocType { get; set; } = string.Empty;
-    /// <summary>Per-branch counter key (docs/BRANCH_ISOLATION_PLAN.md §5) — backfilled to the
-    /// deployment's default branch for rows that predate per-branch numbering.</summary>
-    public int BranchId { get; set; }
-    public Branch? Branch { get; set; }
    public int Year { get; set; }
    public int LastNumber { get; set; }
 }
@@ -15,6 +15,9 @@ public class PoLine
    public int ItemId { get; set; }
    public Item? Item { get; set; }

+    public int UomId { get; set; }
+    public Uom? Uom { get; set; }
+
    public int WarehouseId { get; set; }
    public Warehouse? Warehouse { get; set; }

@@ -1,24 +1,22 @@
 namespace ERPCore.Domain.Entities;

 /// <summary>
-/// Product configuration (FR-MD-11) - a singleton row (single-tenant, docs/00-CORE §1)
+/// Product configuration (FR-MD-11) — a <b>singleton row</b> (single-tenant, docs/00-CORE §1)
 /// gating optional product master-data features.
 /// <para>
 /// <see cref="SubcategoriesEnabled"/> and <see cref="BrandsEnabled"/> are enforced
 /// server-side: an Item write carrying a subcategory/brand while the flag is off is
-/// rejected with <c>CONFIG_DISABLED</c>. <see cref="ItemTypesEnabled"/> is advisory only
-/// - items carry no item-type reference (see <see cref="ItemType"/>), so there is nothing
-/// on a write to reject; the frontend honours it by hiding the variant builder.
-/// <see cref="SellingPricesEnabled"/>, <see cref="SerialNumbersEnabled"/>,
-/// <see cref="BatchListsEnabled"/> and <see cref="WarrantyPeriodsEnabled"/> are enforced
-/// on item writes and drive the create/edit screens. Reads are never gated, so existing
-/// data stays visible after a flag is switched off.
+/// rejected with <c>CONFIG_DISABLED</c>. <see cref="ItemTypesEnabled"/> is
+/// <b>advisory only</b> — items carry no item-type reference (see <see cref="ItemType"/>),
+/// so there is nothing on a write to reject; the frontend honours it by hiding the
+/// builder's type section. Reads are never gated, so existing data stays visible after a
+/// flag is switched off.
 /// </para>
 /// Model: docs/10-BACKEND-PHASE1.md Part C.1.
 /// </summary>
 public class ProductConfig
 {
-    /// <summary>Always 1 - the singleton row's id.</summary>
+    /// <summary>Always 1 — the singleton row's id.</summary>
    public const int SingletonId = 1;

    public int ConfigId { get; set; }
@@ -26,30 +24,6 @@ public class ProductConfig
    public bool SubcategoriesEnabled { get; set; } = true;
    public bool BrandsEnabled { get; set; } = true;
    public bool ItemTypesEnabled { get; set; } = true;
-    public bool SellingPricesEnabled { get; set; } = true;
-    public bool SerialNumbersEnabled { get; set; } = true;
-    public bool BatchListsEnabled { get; set; } = true;
-    public bool WarrantyPeriodsEnabled { get; set; } = true;
-
-    /// <summary>
-    /// Lets the item create screen add a new item variant (item type) on the spot, instead
-    /// of only picking from the Item Variants master. Advisory like <see cref="ItemTypesEnabled"/>
-    /// - it gates a UI shortcut; the Item Variants master itself stays available either way.
-    /// </summary>
-    public bool CustomVariantsEnabled { get; set; }
-
-    /// <summary>
-    /// Allows photos to be uploaded to items (<see cref="ItemImage"/>). Enforced on upload
-    /// (<c>CONFIG_DISABLED</c>); images added earlier stay viewable when switched off.
-    /// </summary>
-    public bool ItemImagesEnabled { get; set; }
-
-    /// <summary>
-    /// Lets items use the active <see cref="WarrantyPeriod"/> master rows alongside the default
-    /// <see cref="Enums.WarrantyPeriods.AllowedMonths"/>. Enforced on item writes. The periods
-    /// themselves are managed under Products, not here.
-    /// </summary>
-    public bool CustomWarrantyPeriodsEnabled { get; set; }

    public DateTime? UpdatedAt { get; set; }

@@ -1,53 +0,0 @@
-using ERPCore.Domain.Enums;
-
-namespace ERPCore.Domain.Entities;
-
-/// <summary>
-/// Vendor invoice consolidating one or more Confirmed GRNs for the same vendor
-/// (each linked GRN becomes one <see cref="PurchaseInvoiceLine"/>, not re-itemized).
-/// Draft is editable (GRNs can be re-selected); Posted reclassifies the GRN clearing
-/// balance to Accounts Payable (see PurchaseInvoiceService.PostAsync); vendor payments
-/// are then recorded against this aggregate rather than against the individual GRNs.
-/// </summary>
-public class PurchaseInvoice
-{
-    public int PurchaseInvoiceId { get; set; }
-    public string DocNo { get; set; } = string.Empty;
-
-    public string VendorInvoiceNo { get; set; } = string.Empty;
-    public DateTime VendorInvoiceDate { get; set; }
-
-    public int VendorId { get; set; }
-    public Vendor? Vendor { get; set; }
-
-    public int BranchId { get; set; }
-    public Branch? Branch { get; set; }
-
-    public string VendorSnapshotName { get; set; } = string.Empty;
-    public string? VendorSnapshotTaxNo { get; set; }
-
-    public PurchaseInvoiceStatus Status { get; set; } = PurchaseInvoiceStatus.Draft;
-
-    public decimal Subtotal { get; set; }
-    public decimal VatTotal { get; set; }
-    public decimal GrandTotal { get; set; }
-    public decimal PaidAmount { get; set; }
-    public decimal BalanceAmount { get; set; }
-
-    /// <summary>Journal number of the AP-recognition GL journal entry posted when this
-    /// invoice is Posted (Debit GRN Clearing / Credit Accounts Payable) — see
-    /// PurchaseInvoiceService.PostAsync.</summary>
-    public string? GlJournalNo { get; set; }
-    public DateTime? GlPostedAt { get; set; }
-
-    public int CreatedBy { get; set; }
-    public User? Creator { get; set; }
-
-    public DateTime CreatedAt { get; set; }
-    public DateTime? UpdatedAt { get; set; }
-
-    public uint RowVersion { get; set; }
-
-    public ICollection<PurchaseInvoiceLine> Lines { get; set; } = new List<PurchaseInvoiceLine>();
-    public ICollection<PurchaseInvoicePayment> Payments { get; set; } = new List<PurchaseInvoicePayment>();
-}
@@ -1,21 +0,0 @@
-namespace ERPCore.Domain.Entities;
-
-/// <summary>
-/// One row per consolidated GRN on a <see cref="PurchaseInvoice"/> — a straight
-/// consolidation of that GRN's line totals, not a re-itemization (docs: Purchase
-/// Invoice consolidates GRNs, it does not re-enter item lines).
-/// </summary>
-public class PurchaseInvoiceLine
-{
-    public int PurchaseInvoiceLineId { get; set; }
-
-    public int PurchaseInvoiceId { get; set; }
-    public PurchaseInvoice? PurchaseInvoice { get; set; }
-
-    public int GrnId { get; set; }
-    public Grn? Grn { get; set; }
-
-    public decimal Subtotal { get; set; }
-    public decimal VatTotal { get; set; }
-    public decimal LineTotal { get; set; }
-}
@@ -1,32 +0,0 @@
-namespace ERPCore.Domain.Entities;
-
-/// <summary>
-/// A vendor payment made against a Posted purchase invoice's balance (installments
-/// allowed — see PurchaseInvoicePaymentService.PayAsync). Posts its own real GL
-/// journal entry (Debit Accounts Payable / Credit the selected bank-or-cash account)
-/// before being recorded here.
-/// </summary>
-public class PurchaseInvoicePayment
-{
-    public int PurchaseInvoicePaymentId { get; set; }
-
-    public int PurchaseInvoiceId { get; set; }
-    public PurchaseInvoice? PurchaseInvoice { get; set; }
-
-    public decimal Amount { get; set; }
-    public DateTime PaymentDate { get; set; }
-
-    /// <summary>GL's numeric id for the bank/cash account the payment was made from.</summary>
-    public long GlBankAccountId { get; set; }
-    /// <summary>Snapshot of the account's display name at payment time (GL account lists have no local FK).</summary>
-    public string BankAccountName { get; set; } = string.Empty;
-
-    public string? Reference { get; set; }
-
-    /// <summary>Journal number of the real GL journal entry this payment posted.</summary>
-    public string? GlJournalNo { get; set; }
-
-    public int CreatedBy { get; set; }
-    public User? Creator { get; set; }
-    public DateTime CreatedAt { get; set; }
-}
@@ -5,10 +5,9 @@ namespace ERPCore.Domain.Entities;
 /// <summary>
 /// Purchase order header (FR-PROC-03..06). Mutable aggregate with a
 /// <see cref="RowVersion"/> ETag token; editable while open (FR-PROC-05).
-/// A submitted/issued PO goes to <see cref="PurchaseOrderStatus.PendingApproval"/> and
-/// needs a separate Approve action (an Admin who isn't <see cref="CreatedBy"/>) before it
-/// reaches <see cref="PurchaseOrderStatus.Approved"/>. Totals are computed server-side
-/// from lines (not stored). Model: docs/10 Part C.2.
+/// Phase 1 auto-approves on creation; <see cref="ApprovalRequired"/> is retained
+/// for the future approval workflow. Totals are computed server-side from lines
+/// (not stored). Model: docs/10 Part C.2.
 /// </summary>
 public class PurchaseOrder
 {
@@ -18,25 +17,15 @@ public class PurchaseOrder
    public int VendorId { get; set; }
    public Vendor? Vendor { get; set; }

-    public int BranchId { get; set; }
-    public Branch? Branch { get; set; }
-
    public int? RequisitionId { get; set; }
    public Requisition? Requisition { get; set; }

    public PurchaseOrderStatus Status { get; set; } = PurchaseOrderStatus.Draft;
-    /// <summary>True once the PO has been (or needs to be) routed through approval —
-    /// i.e. it is not a still-editable Draft.</summary>
    public bool ApprovalRequired { get; set; }

    public int CreatedBy { get; set; }
    public User? Creator { get; set; }

-    /// <summary>Who approved this PO — set only when <see cref="Status"/> reaches Approved.</summary>
-    public int? ApprovedBy { get; set; }
-    public User? Approver { get; set; }
-    public DateTime? ApprovedAt { get; set; }
-
    public DateTime CreatedAt { get; set; }
    public DateTime? UpdatedAt { get; set; }

@@ -28,12 +28,5 @@ public class PurchaseReturn

    public DateTime CreatedAt { get; set; }

-    /// <summary>Journal number of the real GL journal entry posted for this return (set on create — it auto-posts).
-    /// Reverses the Inventory/Clearing lines a Grn posts — <see cref="PurchaseReturnLine"/> carries no unit
-    /// price/VAT of its own, so it can't reverse a VAT-recoverable line the way a real credit note would.</summary>
-    public string? GlJournalNo { get; set; }
-    public DateTime? GlPostedAt { get; set; }
-
    public ICollection<PurchaseReturnLine> Lines { get; set; } = new List<PurchaseReturnLine>();
 }
-
@@ -14,9 +14,6 @@ public class Requisition
    public int RequestedBy { get; set; }
    public User? Requester { get; set; }

-    public int BranchId { get; set; }
-    public Branch? Branch { get; set; }
-
    public RequisitionStatus Status { get; set; } = RequisitionStatus.Draft;
    public DateTime CreatedAt { get; set; }

@@ -14,9 +14,6 @@ public class Rfq
    public int RequisitionId { get; set; }
    public Requisition? Requisition { get; set; }

-    public int BranchId { get; set; }
-    public Branch? Branch { get; set; }
-
    public RfqStatus Status { get; set; } = RfqStatus.Open;
    public DateTime CreatedAt { get; set; }

@@ -1,5 +1,3 @@
-using ERPCore.Domain.Enums;
-
 namespace ERPCore.Domain.Entities;

 /// <summary>Join row granting a <see cref="Role"/> visibility of a <see cref="Permission"/> (nav node).</summary>
@@ -8,13 +6,6 @@ public class RolePermission
    public int RoleId { get; set; }
    public int PermissionId { get; set; }

-    /// <summary>
-    /// Which mutating actions the role may perform within this permission's module
-    /// (see <see cref="RolePermissionAction"/>); defaults to <see cref="RolePermissionAction.All"/>
-    /// so existing grants keep today's behavior until an admin narrows them.
-    /// </summary>
-    public RolePermissionAction Actions { get; set; } = RolePermissionAction.All;
-
    public Role? Role { get; set; }
    public Permission? Permission { get; set; }
 }
@@ -31,14 +31,10 @@ public class RunStageInput
    public int? FromRunOutputId { get; set; }
    public RunStageOutput? FromRunOutput { get; set; }

-    /// <summary>Copied from the template input: what <see cref="PlannedQty"/> is expressed in.</summary>
-    public StageQtyUnit QtyUnit { get; set; } = StageQtyUnit.Pack;
+    public int UomId { get; set; }
+    public Uom? Uom { get; set; }

-    /// <summary>
-    /// Scaled at creation; per-run editable until the stage starts (FR-MFG-08,
-    /// <c>409 STAGE_NOT_EDITABLE</c>). Expressed in <see cref="QtyUnit"/> — so unlike the
-    /// consumption figures below it is <b>not</b> necessarily a pack count.
-    /// </summary>
+    /// <summary>Scaled at creation; per-run editable until the stage starts (FR-MFG-08, <c>409 STAGE_NOT_EDITABLE</c>).</summary>
    public decimal PlannedQty { get; set; }

    /// <summary>
@@ -23,17 +23,10 @@ public class RunStageOutput

    public string Name { get; set; } = string.Empty;

-    /// <summary>
-    /// Display label for intermediate WIP; null on the terminal output, whose unit is the
-    /// finished item's base UOM. Never converted — see <see cref="StageOutput.UomId"/>.
-    /// </summary>
-    public int? UomId { get; set; }
+    public int UomId { get; set; }
    public Uom? Uom { get; set; }

-    /// <summary>
-    /// Scaled at creation; per-run editable until the stage starts. Every quantity on an
-    /// output is a pack count, so scrap is recorded in whole broken bottles rather than ml.
-    /// </summary>
+    /// <summary>Scaled at creation; per-run editable until the stage starts.</summary>
    public decimal PlannedQty { get; set; }

    /// <summary>Recorded at complete. A re-complete after a rework <b>overwrites</b> this, never adds to it.</summary>
@@ -1,61 +0,0 @@
-namespace ERPCore.Domain.Entities;
-
-/// <summary>
-/// Sales configuration — a singleton row (single-tenant, docs/00-CORE §1), same shape as
-/// <see cref="BranchConfig"/>. When <see cref="AllowCashCustomer"/> is on, sales documents may
-/// be raised against the generic "Cash Customer" (<see cref="CashCustomerId"/>) and the New Sale
-/// form defaults to it; when off, a real customer must be picked and the cash customer is
-/// rejected server-side (see SalesDomainService.ValidateSalesHeaderAsync).
-/// </summary>
-public class SalesConfig
-{
-    /// <summary>Always 1 - the singleton row's id.</summary>
-    public const int SingletonId = 1;
-
-    public int ConfigId { get; set; }
-
-    public bool AllowCashCustomer { get; set; }
-
-    /// <summary>The Customer row used for cash (walk-in, unnamed) sales. Created on first
-    /// enabling <see cref="AllowCashCustomer"/> and kept afterwards, so switching the option
-    /// off and on again reuses the same customer (and its sales history).</summary>
-    public int? CashCustomerId { get; set; }
-    public Customer? CashCustomer { get; set; }
-
-    /// <summary>When on, sales invoice lines may carry a free quantity (the New Sale "Free"
-    /// column); when off, the column is hidden and a free qty above zero is rejected server-side
-    /// (see SalesInvoiceService.BuildLinesAsync). Defaults on, matching the behaviour before
-    /// this option existed.</summary>
-    public bool AllowFreeItems { get; set; } = true;
-
-    /// <summary>When on, sales invoice lines may carry a line discount (the New Sale "Disc %"
-    /// column); when off, the column is hidden and a discount above zero is rejected server-side
-    /// (see SalesInvoiceService.BuildLinesAsync). Defaults on, matching the behaviour before
-    /// this option existed.</summary>
-    public bool AllowDiscounts { get; set; } = true;
-
-    /// <summary>When on, posting a sale (invoice, slip, bundle) may issue more than the stock on
-    /// hand — the shortfall drives on-hand negative (see FifoCostingService.ConsumeAsync) and the
-    /// pre-post check reports it as a warning only. When off (default), posting is blocked with
-    /// STOCK_NEGATIVE_BLOCKED until stock covers every line.</summary>
-    public bool AllowOverStockSale { get; set; }
-
-    /// <summary>When on (default) and no <see cref="DefaultWarehouseId"/> is saved, New Sale shows
-    /// a Warehouse picker. When off, a default must be saved.</summary>
-    public bool AllowWarehouseSelection { get; set; } = true;
-
-    /// <summary>Default sales warehouse. Whenever set, New Sale shows only this warehouse (locked)
-    /// and every sales invoice (header and lines) is forced onto it server-side (see
-    /// SalesDomainService.GetForcedSalesWarehouseIdAsync). Required while
-    /// <see cref="AllowWarehouseSelection"/> is off; clearing it brings the picker back.</summary>
-    public int? DefaultWarehouseId { get; set; }
-    public Warehouse? DefaultWarehouse { get; set; }
-
-    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; }
-}
@@ -1,56 +0,0 @@
-namespace ERPCore.Domain.Entities;
-
-/// <summary>
-/// A cashier's end-of-day close-out. Aggregates every <see cref="SalesSlip"/> the
-/// cashier posted on <see cref="BusinessDate"/>, freezes them against this record
-/// (<see cref="SalesSlip.DayEndId"/>) so a slip can only ever belong to one day-end,
-/// and posts one consolidated GL journal entry for the day's revenue/tax/COGS —
-/// the sales-side equivalent of how <see cref="Grn"/> posts per receipt. Unique per
-/// (CashierUserId, BusinessDate): closing twice replays the existing record instead
-/// of creating a second one (same idempotent-replay pattern as Grn.ConfirmAsync).
-/// </summary>
-public class SalesDayEnd
-{
-    public int SalesDayEndId { get; set; }
-    public string DocNo { get; set; } = string.Empty;
-
-    public int CashierUserId { get; set; }
-    public User? CashierUser { get; set; }
-
-    /// <summary>The calendar date being closed (matched against each slip's <see cref="SalesSlip.SlipDate"/>, UTC).</summary>
-    public DateOnly BusinessDate { get; set; }
-
-    public int SlipCount { get; set; }
-    public int BundleCount { get; set; }
-    public decimal Subtotal { get; set; }
-    public decimal DiscountTotal { get; set; }
-    public decimal TaxTotal { get; set; }
-    public decimal GrandTotal { get; set; }
-
-    /// <summary>
-    /// Sum of <see cref="SalesSlip.PaidAmount"/> across the day's slips (bundle sales have no
-    /// partial-payment field and are always counted as fully paid) — what actually gets debited
-    /// to Cash on close. <see cref="BalanceTotal"/> is the rest (<c>GrandTotal - PaidTotal</c>),
-    /// debited to Accounts Receivable instead. Before partial payments existed these were always
-    /// equal to GrandTotal/0 respectively (every sale was assumed fully cash).
-    /// </summary>
-    public decimal PaidTotal { get; set; }
-    public decimal BalanceTotal { get; set; }
-
-    /// <summary>Sum of the FIFO cost consumed for these slips (from <see cref="StockLedger"/>), for the COGS GL lines.</summary>
-    public decimal CostOfGoodsSold { get; set; }
-
-    /// <summary>Journal number of the real GL journal entry posted for this close (null when there was nothing to post).</summary>
-    public string? GlJournalNo { get; set; }
-    public DateTime? GlPostedAt { get; set; }
-
-    public int ClosedBy { get; set; }
-    public User? ClosedByUser { get; set; }
-    public DateTime ClosedAt { get; set; }
-
-    /// <summary>PostgreSQL xmin-backed optimistic concurrency token.</summary>
-    public uint RowVersion { get; set; }
-
-    public ICollection<SalesSlip> Slips { get; set; } = new List<SalesSlip>();
-    public ICollection<BundleSale> BundleSales { get; set; } = new List<BundleSale>();
-}
--- a/Show More
+++ b/Show More