feat: add production navigation permissions and produced items page

- Created a new migration to add navigation items and permissions for the production section.
- Implemented the Produced Items page with filtering options for date range, templates, warehouses, and status.
- Integrated API calls to fetch produced items, templates, and warehouses.
- Added UI components for displaying produced items in a table format with relevant details.

Backend/ERPCore/Controllers/GrnsController.cs

@@ -11,8 +11,13 @@ namespace ERPCore.Controllers;
 public sealed class GrnsController : ApiControllerBase
 {
     private readonly IGrnService _grns;
+    private readonly IGrnPaymentService _payments;
 
-    public GrnsController(IGrnService grns) => _grns = grns;
+    public GrnsController(IGrnService grns, IGrnPaymentService payments)
+    {
+        _grns = grns;
+        _payments = payments;
+    }
 
     /// <summary>List GRNs, newest first.</summary>
     [HttpGet]
@@ -59,4 +64,23 @@ public sealed class GrnsController : ApiControllerBase
     public async Task<ActionResult<ReleaseLineResultDto>> Release(
         int grnId, int grnLineId, [FromBody] ReleaseLineRequest request, CancellationToken ct)
         => Ok(await _grns.ReleaseLineAsync(grnId, grnLineId, request.Action, ct));
+
+    /// <summary>Pay the vendor against this GRN's balance, in full or in installments; posts a real GL journal entry.</summary>
+    [HttpPost("{grnId:int}/payments")]
+    [ProducesResponseType(typeof(GrnPaymentDto), StatusCodes.Status201Created)]
+    [ProducesResponseType(StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    [ProducesResponseType(StatusCodes.Status409Conflict)]
+    public async Task<ActionResult<GrnPaymentDto>> Pay(int grnId, [FromBody] CreateGrnPaymentRequest request, CancellationToken ct)
+    {
+        var dto = await _payments.PayAsync(grnId, request, ct);
+        return Created($"/api/v1/grns/{grnId}/payments/{dto.GrnPaymentId}", dto);
+    }
+
+    /// <summary>Payment history for this GRN, newest first.</summary>
+    [HttpGet("{grnId:int}/payments")]
+    [ProducesResponseType(typeof(IReadOnlyList<GrnPaymentDto>), StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public async Task<ActionResult<IReadOnlyList<GrnPaymentDto>>> ListPayments(int grnId, CancellationToken ct)
+        => Ok(await _payments.ListAsync(grnId, ct));
 }

Backend/ERPCore/Controllers/ProductionRunsController.cs

@@ -24,6 +24,19 @@ 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)]

Backend/ERPCore/Controllers/SalesDayEndController.cs

@@ -0,0 +1,50 @@
+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")]
+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);
+    }
+}

Backend/ERPCore/Controllers/SalesInvoicesController.cs

@@ -10,8 +10,13 @@ namespace ERPCore.Controllers;
 public sealed class SalesInvoicesController : ApiControllerBase
 {
     private readonly ISalesInvoiceService _invoices;
+    private readonly ISalesInvoicePaymentService _payments;
 
-    public SalesInvoicesController(ISalesInvoiceService invoices) => _invoices = invoices;
+    public SalesInvoicesController(ISalesInvoiceService invoices, ISalesInvoicePaymentService payments)
+    {
+        _invoices = invoices;
+        _payments = payments;
+    }
 
     [HttpGet]
     [ProducesResponseType(typeof(PagedResponse<SalesInvoiceSummaryDto>), StatusCodes.Status200OK)]
@@ -70,4 +75,23 @@ 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>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));
 }

Backend/ERPCore/Domain/DocumentTypes.cs

@@ -21,4 +21,7 @@ public static class DocumentTypes
     public const string SalesSlip = "SSL";
     public const string BundleSale = "BND";
     public const string SalesReturn = "SRET";
+
+    /// <summary>Cashier day-end close-out (Sales) — <c>DEND-2026-00001</c>.</summary>
+    public const string SalesDayEnd = "DEND";
 }

Backend/ERPCore/Domain/Entities/BundleSale.cs

@@ -29,5 +29,11 @@ public class BundleSale
     public DateTime? UpdatedAt { get; set; }
     public int ConcurrencyStamp { 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 ICollection<BundleSaleLine> Lines { get; set; } = new List<BundleSaleLine>();
 }

Backend/ERPCore/Domain/Entities/Grn.cs

@@ -30,8 +30,18 @@ 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>Sum of vendor payments made against this GRN's total payable (<see cref="GrnLine.LineTotal"/>).</summary>
+    public decimal PaidAmount { get; set; }
+    /// <summary>Total payable minus <see cref="PaidAmount"/>; installments accrue against this until it reaches zero.</summary>
+    public decimal BalanceAmount { get; set; }
+
     /// <summary>PostgreSQL xmin-backed optimistic concurrency token.</summary>
     public uint RowVersion { get; set; }
 
     public ICollection<GrnLine> Lines { get; set; } = new List<GrnLine>();
+    public ICollection<GrnPayment> Payments { get; set; } = new List<GrnPayment>();
 }

Backend/ERPCore/Domain/Entities/GrnPayment.cs

@@ -0,0 +1,31 @@
+namespace ERPCore.Domain.Entities;
+
+/// <summary>
+/// A vendor payment made against a confirmed GRN's balance (installments allowed —
+/// see GrnPaymentService.PayAsync). Posts its own real GL journal entry (Debit GRN
+/// Clearing / Credit the selected bank-or-cash account) before being recorded here.
+/// </summary>
+public class GrnPayment
+{
+    public int GrnPaymentId { get; set; }
+
+    public int GrnId { get; set; }
+    public Grn? Grn { 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; }
+}

Backend/ERPCore/Domain/Entities/PurchaseReturn.cs

@@ -28,5 +28,12 @@ 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>();
 }
+

Backend/ERPCore/Domain/Entities/SalesDayEnd.cs

@@ -0,0 +1,46 @@
+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 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>();
+}

Backend/ERPCore/Domain/Entities/SalesInvoice.cs

@@ -29,6 +29,14 @@ public class SalesInvoice
     public decimal PaidAmount { get; set; }
     public decimal BalanceAmount { get; set; }
 
+    /// <summary>Journal number of the revenue-recognition GL journal entry posted when this
+    /// invoice is Posted (Debit Accounts Receivable / Credit Sales Revenue + Tax, plus COGS —
+    /// see SalesPostingService.PostInvoiceAsync). Unlike a SalesSlip, an invoice posts its own
+    /// GL entry immediately rather than waiting for Sales Day End, since invoices aren't a
+    /// cashier document and don't go through that close-out.</summary>
+    public string? GlJournalNo { get; set; }
+    public DateTime? GlPostedAt { get; set; }
+
     public int CreatedBy { get; set; }
     public User? Creator { get; set; }
 
@@ -38,4 +46,5 @@ public class SalesInvoice
     public uint RowVersion { get; set; }
 
     public ICollection<SalesInvoiceLine> Lines { get; set; } = new List<SalesInvoiceLine>();
+    public ICollection<SalesInvoicePayment> Payments { get; set; } = new List<SalesInvoicePayment>();
 }

Backend/ERPCore/Domain/Entities/SalesInvoicePayment.cs

@@ -0,0 +1,32 @@
+namespace ERPCore.Domain.Entities;
+
+/// <summary>
+/// A customer payment made against a Posted sales invoice's balance (installments
+/// allowed — see SalesInvoicePaymentService.PayAsync). Posts its own real GL journal
+/// entry (Debit the selected bank-or-cash account / Credit Accounts Receivable) before
+/// being recorded here — the mirror image of <see cref="GrnPayment"/>.
+/// </summary>
+public class SalesInvoicePayment
+{
+    public int SalesInvoicePaymentId { get; set; }
+
+    public int SalesInvoiceId { get; set; }
+    public SalesInvoice? SalesInvoice { 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 received into.</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; }
+}

Backend/ERPCore/Domain/Entities/SalesReturn.cs

@@ -28,5 +28,11 @@ public class SalesReturn
 
     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 Inventory/COGS only — <see cref="SalesReturnLine"/> carries no unit price, so revenue/tax aren't
+    /// reversed here (they'd need a per-line price this document doesn't capture).</summary>
+    public string? GlJournalNo { get; set; }
+    public DateTime? GlPostedAt { get; set; }
+
     public ICollection<SalesReturnLine> Lines { get; set; } = new List<SalesReturnLine>();
 }

Backend/ERPCore/Domain/Entities/SalesSlip.cs

@@ -27,6 +27,10 @@ public class SalesSlip
     public decimal PaidAmount { get; set; }
     public decimal BalanceAmount { get; set; }
 
+    /// <summary>Set once this slip's business date is closed by <see cref="SalesDayEnd"/> — a closed slip is frozen (no further edits).</summary>
+    public int? DayEndId { get; set; }
+    public SalesDayEnd? DayEnd { get; set; }
+
     public DateTime CreatedAt { get; set; }
     public DateTime? UpdatedAt { get; set; }
 

Backend/ERPCore/Domain/Entities/StockAdjustment.cs

@@ -27,5 +27,10 @@ public class StockAdjustment
     public DateTime CreatedAt { get; set; }
     public uint RowVersion { get; set; }
 
+    /// <summary>Journal number of the real GL journal entry posted for this adjustment (set on create — it
+    /// auto-posts). Increases and decreases post separately (never netted) so gains/losses stay visible.</summary>
+    public string? GlJournalNo { get; set; }
+    public DateTime? GlPostedAt { get; set; }
+
     public ICollection<StockAdjustmentLine> Lines { get; set; } = new List<StockAdjustmentLine>();
 }

Backend/ERPCore/Dtos/Grn/GrnDtos.cs

@@ -16,23 +16,36 @@ public sealed record GrnLineDto(
 
 public sealed record GrnDto(
     int GrnId, string DocNo, int? PoId, int VendorId, int WarehouseId, GrnStatus Status,
-    int CreatedBy, DateTime CreatedAt, DateTime? PostedAt, IReadOnlyList<GrnLineDto> Lines);
+    int CreatedBy, DateTime CreatedAt, DateTime? PostedAt, string? GlJournalNo,
+    decimal PaidAmount, decimal BalanceAmount, IReadOnlyList<GrnLineDto> Lines);
 
 /// <summary>Row shape for <c>GET /grns</c> — line count instead of the lines themselves.</summary>
 public sealed record GrnSummaryDto(
     int GrnId, string DocNo, int? PoId, int VendorId, int WarehouseId, GrnStatus Status,
-    int CreatedBy, DateTime CreatedAt, DateTime? PostedAt, int LineCount);
+    int CreatedBy, DateTime CreatedAt, DateTime? PostedAt, int LineCount,
+    decimal PaidAmount, decimal BalanceAmount);
 
 public sealed record CreatedLayerDto(
     int LayerId, int ItemId, int WarehouseId, int? BatchId,
     decimal QtyReceived, decimal QtyRemaining, decimal UnitCost, DateTime ReceiptDate);
 
 public sealed record GrnConfirmResultDto(
-    int GrnId, GrnStatus Status, DateTime PostedAt,
+    int GrnId, GrnStatus Status, DateTime PostedAt, string GlJournalNo, decimal BalanceAmount,
     IReadOnlyList<CreatedLayerDto> CreatedLayers, IReadOnlyList<int> LedgerRefs, PurchaseOrderStatus? PoStatus);
 
 public sealed record ReleaseLineResultDto(int GrnLineId, HoldStatus HoldStatus);
 
+public sealed record GrnPaymentDto(
+    int GrnPaymentId, int GrnId, decimal Amount, DateTime PaymentDate,
+    long GlBankAccountId, string BankAccountName, string? Reference, string? GlJournalNo, DateTime CreatedAt);
+
+public sealed class CreateGrnPaymentRequest
+{
+    [Range(0.01, double.MaxValue)] public decimal Amount { get; set; }
+    [Required] public long GlBankAccountId { get; set; }
+    [StringLength(100)] public string? Reference { get; set; }
+}
+
 // Requests ----------------------------------------------------------------------
 
 public sealed class BatchInput

Backend/ERPCore/Dtos/Procurement/PurchaseReturnDtos.cs

@@ -9,12 +9,13 @@ public sealed record PurchaseReturnLineDto(int ReturnLineId, int? GrnLineId, int
 
 public sealed record PurchaseReturnDto(
     int ReturnId, string DocNo, int VendorId, int WarehouseId, int ReasonCodeId, ReturnStatus Status,
-    int CreatedBy, DateTime CreatedAt, IReadOnlyList<PurchaseReturnLineDto> Lines, IReadOnlyList<int> LedgerRefs);
+    int CreatedBy, DateTime CreatedAt, string? GlJournalNo, DateTime? GlPostedAt,
+    IReadOnlyList<PurchaseReturnLineDto> Lines, IReadOnlyList<int> LedgerRefs);
 
 /// <summary>Row shape for <c>GET /purchase-returns</c> — no lines/ledgerRefs (those need a per-row query).</summary>
 public sealed record PurchaseReturnSummaryDto(
     int ReturnId, string DocNo, int VendorId, int WarehouseId, int ReasonCodeId, ReturnStatus Status,
-    int CreatedBy, DateTime CreatedAt, int LineCount);
+    int CreatedBy, DateTime CreatedAt, int LineCount, string? GlJournalNo);
 
 // Requests ----------------------------------------------------------------------
 

Backend/ERPCore/Dtos/Production/RunDtos.cs

@@ -70,6 +70,35 @@ public sealed record RunEventDto(
     int EventId, int? RunStageId, RunStageEventType EventType, string? Note,
     JsonElement? Payload, int UserId, DateTime CreatedAt);
 
+/// <summary>
+/// One row of the produced-items report (<c>GET /production-runs/produced</c>) — the
+/// terminal output of a run that has produced something, costed the same way
+/// <c>PostReceiptAsync</c> costs the finished layer at approve (FR-MFG-13):
+/// <c>unitCost = (Σ ConsumedValue − Σ ReturnedValue) / (ProducedQty − ScrappedQty)</c>.
+/// One row per run — server validation (<see cref="ProductionGraphValidator"/> via
+/// FR-MFG-05) guarantees exactly one item-bearing output per run, always the terminal
+/// one, so run and produced line coincide 1:1.
+/// <para><c>UnitCost</c>/<c>TotalCost</c> are final only once <c>Status</c> is
+/// <c>Completed</c> — a leftover return can still shrink the pool between the terminal
+/// stage's Done and its Approve, same caveat as <see cref="CostPoolDto"/>.</para>
+/// </summary>
+public sealed record ProducedLineDto(
+    int RunId, string DocNo, ProductionRunStatus Status,
+    int TemplateId, string TemplateName,
+    int WarehouseId, string WarehouseName,
+    int ItemId, string ItemName,
+    decimal ProducedQty, decimal ScrappedQty, decimal GoodQty,
+    decimal UnitCost, decimal TotalCost,
+    DateTime CreatedAt, DateTime? CompletedAt);
+
+/// <summary>Aggregate footer for the produced-items report — totals over every row the filter
+/// matched, not just the current page (there is no pagination here, matching the Sales report
+/// convention of flat, filter-bounded rows).</summary>
+public sealed record ProducedSummaryDto(
+    int RunCount, decimal TotalProducedQty, decimal TotalScrappedQty, decimal TotalGoodQty, decimal TotalCost);
+
+public sealed record ProducedListResponseDto(IReadOnlyList<ProducedLineDto> Items, ProducedSummaryDto Summary);
+
 /// <summary>Full run graph (docs/30 §D.2 <c>GET /production-runs/{id}</c>).</summary>
 public sealed record RunGraphDto(
     int RunId, string DocNo, int TemplateId, string TemplateName,

Backend/ERPCore/Dtos/Sales/SalesDayEndDtos.cs

@@ -0,0 +1,40 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace ERPCore.Dtos.Sales;
+
+// Responses -----------------------------------------------------------------------
+
+/// <summary>Qty/revenue sold for one item across a closed (or about-to-close) day, for the day-end report.
+/// Merges sales-slip and bundle-sale lines for the same item into one row.</summary>
+public sealed record SalesDayEndItemLineDto(int ItemId, string Sku, string Name, decimal Qty, decimal Revenue);
+
+public sealed record SalesDayEndDto(
+    int SalesDayEndId, string DocNo, int CashierUserId, DateOnly BusinessDate,
+    int SlipCount, int BundleCount, decimal Subtotal, decimal DiscountTotal, decimal TaxTotal, decimal GrandTotal,
+    decimal CostOfGoodsSold, string? GlJournalNo, DateTime? GlPostedAt, int ClosedBy, DateTime ClosedAt,
+    IReadOnlyList<string> SlipNumbers, IReadOnlyList<string> BundleNumbers, IReadOnlyList<SalesDayEndItemLineDto> ItemBreakdown);
+
+public sealed record SalesDayEndSummaryDto(
+    int SalesDayEndId, string DocNo, int CashierUserId, DateOnly BusinessDate,
+    int SlipCount, int BundleCount, decimal GrandTotal, string? GlJournalNo, DateTime ClosedAt);
+
+/// <summary>What closing right now would include — call before <c>POST /sales-day-end</c> so the
+/// cashier can see the day's totals, and any still-Draft slips/bundles blocking the close.</summary>
+public sealed record SalesDayEndPreviewDto(
+    int CashierUserId, DateOnly BusinessDate, bool AlreadyClosed,
+    int SlipCount, int BundleCount, decimal Subtotal, decimal DiscountTotal, decimal TaxTotal, decimal GrandTotal,
+    IReadOnlyList<string> SlipNumbers, IReadOnlyList<string> BundleNumbers,
+    IReadOnlyList<DraftSlipBlockingCloseDto> DraftSlipsBlockingClose,
+    IReadOnlyList<DraftBundleBlockingCloseDto> DraftBundleSalesBlockingClose);
+
+public sealed record DraftSlipBlockingCloseDto(int SalesSlipId, string SlipNo, decimal GrandTotal);
+public sealed record DraftBundleBlockingCloseDto(int BundleSaleId, string BundleNo, decimal GrandTotal);
+
+// Requests ------------------------------------------------------------------------
+
+public sealed class CreateSalesDayEndRequest
+{
+    [Required] public int CashierUserId { get; set; }
+    /// <summary>Defaults to today (UTC) when omitted.</summary>
+    public DateOnly? BusinessDate { get; set; }
+}

Backend/ERPCore/Dtos/Sales/SalesInvoiceDtos.cs

@@ -17,12 +17,24 @@ public sealed record SalesInvoiceDto(
     int SalesInvoiceId, string InvoiceNo, DateTime InvoiceDate, int CustomerId,
     string CustomerSnapshotName, string? CustomerSnapshotTaxNo, int WarehouseId,
     SalesInvoiceType InvoiceType, SalesInvoiceStatus Status, int CreatedBy, DateTime CreatedAt,
-    DateTime? UpdatedAt, SalesInvoiceTotalsDto Totals, IReadOnlyList<SalesInvoiceLineDto> Lines);
+    DateTime? UpdatedAt, string? GlJournalNo, DateTime? GlPostedAt,
+    SalesInvoiceTotalsDto Totals, IReadOnlyList<SalesInvoiceLineDto> Lines);
 
 public sealed record SalesInvoiceSummaryDto(
     int SalesInvoiceId, string InvoiceNo, DateTime InvoiceDate, int CustomerId,
     string CustomerSnapshotName, int WarehouseId, SalesInvoiceType InvoiceType,
-    SalesInvoiceStatus Status, SalesInvoiceTotalsDto Totals, DateTime CreatedAt);
+    SalesInvoiceStatus Status, SalesInvoiceTotalsDto Totals, DateTime CreatedAt, string? GlJournalNo);
+
+public sealed record SalesInvoicePaymentDto(
+    int SalesInvoicePaymentId, int SalesInvoiceId, decimal Amount, DateTime PaymentDate,
+    long GlBankAccountId, string BankAccountName, string? Reference, string? GlJournalNo, DateTime CreatedAt);
+
+public sealed class CreateSalesInvoicePaymentRequest
+{
+    [Range(0.01, double.MaxValue)] public decimal Amount { get; set; }
+    [Required] public long GlBankAccountId { get; set; }
+    [StringLength(100)] public string? Reference { get; set; }
+}
 
 public sealed record SalesInvoicePostingIssueDto(
     int SalesInvoiceLineId, int ItemId, string ItemSku, string ItemName, int WarehouseId,

Backend/ERPCore/Dtos/Sales/SalesReturnDtos.cs

@@ -9,12 +9,13 @@ public sealed record SalesReturnLineDto(int ReturnLineId, int? SalesInvoiceLineI
 
 public sealed record SalesReturnDto(
     int ReturnId, string DocNo, int CustomerId, int WarehouseId, int ReasonCodeId, ReturnStatus Status,
-    int CreatedBy, DateTime CreatedAt, IReadOnlyList<SalesReturnLineDto> Lines, IReadOnlyList<int> LedgerRefs);
+    int CreatedBy, DateTime CreatedAt, string? GlJournalNo, DateTime? GlPostedAt,
+    IReadOnlyList<SalesReturnLineDto> Lines, IReadOnlyList<int> LedgerRefs);
 
 /// <summary>Row shape for <c>GET /sales-returns</c> — no lines/ledgerRefs (those need a per-row query).</summary>
 public sealed record SalesReturnSummaryDto(
     int ReturnId, string DocNo, int CustomerId, int WarehouseId, int ReasonCodeId, ReturnStatus Status,
-    int CreatedBy, DateTime CreatedAt, int LineCount, decimal TotalQty);
+    int CreatedBy, DateTime CreatedAt, int LineCount, decimal TotalQty, string? GlJournalNo);
 
 /// <summary>
 /// Remaining returnable qty for one sales invoice line — the invoiced qty minus

Backend/ERPCore/Dtos/Stock/AdjustmentDtos.cs

@@ -9,12 +9,13 @@ public sealed record AdjustmentLineDto(int AdjLineId, int ItemId, int? BinId, in
 
 public sealed record AdjustmentDto(
     int AdjustmentId, string DocNo, int WarehouseId, int ReasonCodeId, AdjustmentStatus Status,
-    int CreatedBy, DateTime CreatedAt, IReadOnlyList<AdjustmentLineDto> Lines, IReadOnlyList<int> LedgerRefs);
+    int CreatedBy, DateTime CreatedAt, string? GlJournalNo, DateTime? GlPostedAt,
+    IReadOnlyList<AdjustmentLineDto> Lines, IReadOnlyList<int> LedgerRefs);
 
 /// <summary>Row shape for <c>GET /stock-adjustments</c> — no lines/ledgerRefs (those need a per-row query).</summary>
 public sealed record AdjustmentSummaryDto(
     int AdjustmentId, string DocNo, int WarehouseId, int ReasonCodeId, AdjustmentStatus Status,
-    int CreatedBy, DateTime CreatedAt, int LineCount);
+    int CreatedBy, DateTime CreatedAt, int LineCount, string? GlJournalNo);
 
 // Requests ----------------------------------------------------------------------
 

Backend/ERPCore/Dtos/Stock/CountDtos.cs

@@ -16,7 +16,7 @@ public sealed record CountSummaryDto(
     int CountId, string DocNo, int WarehouseId, CountType CountType, CountStatus Status,
     int CreatedBy, DateTime CreatedAt, int LineCount);
 
-public sealed record CountPostResultDto(int CountId, CountStatus Status, int? AdjustmentId, IReadOnlyList<int> LedgerRefs);
+public sealed record CountPostResultDto(int CountId, CountStatus Status, int? AdjustmentId, string? GlJournalNo, IReadOnlyList<int> LedgerRefs);
 
 // Requests ----------------------------------------------------------------------
 

Backend/ERPCore/Infra/Persistence/Configurations/GrnConfiguration.cs

@@ -16,6 +16,9 @@ public sealed class GrnConfiguration : IEntityTypeConfiguration<Grn>
 
         builder.Property(g => g.Status).HasConversion<string>().HasMaxLength(20).IsRequired();
         builder.Property(g => g.CreatedAt).IsRequired();
+        builder.Property(g => g.GlJournalNo).HasMaxLength(30);
+        builder.Property(g => g.PaidAmount).HasPrecision(18, 4);
+        builder.Property(g => g.BalanceAmount).HasPrecision(18, 4);
         builder.Property(g => g.RowVersion).IsRowVersion();
 
         builder.HasOne(g => g.PurchaseOrder).WithMany().HasForeignKey(g => g.PoId).OnDelete(DeleteBehavior.Restrict);
@@ -28,6 +31,27 @@ public sealed class GrnConfiguration : IEntityTypeConfiguration<Grn>
     }
 }
 
+public sealed class GrnPaymentConfiguration : IEntityTypeConfiguration<GrnPayment>
+{
+    public void Configure(EntityTypeBuilder<GrnPayment> builder)
+    {
+        builder.ToTable("grn_payments");
+        builder.HasKey(p => p.GrnPaymentId);
+
+        builder.Property(p => p.Amount).HasPrecision(18, 4);
+        builder.Property(p => p.PaymentDate).IsRequired();
+        builder.Property(p => p.BankAccountName).IsRequired().HasMaxLength(200);
+        builder.Property(p => p.Reference).HasMaxLength(100);
+        builder.Property(p => p.GlJournalNo).HasMaxLength(30);
+        builder.Property(p => p.CreatedAt).IsRequired();
+
+        builder.HasOne(p => p.Grn).WithMany(g => g.Payments).HasForeignKey(p => p.GrnId).OnDelete(DeleteBehavior.Restrict);
+        builder.HasOne(p => p.Creator).WithMany().HasForeignKey(p => p.CreatedBy).OnDelete(DeleteBehavior.Restrict);
+
+        builder.HasIndex(p => p.GrnId);
+    }
+}
+
 public sealed class GrnLineConfiguration : IEntityTypeConfiguration<GrnLine>
 {
     public void Configure(EntityTypeBuilder<GrnLine> builder)

Backend/ERPCore/Infra/Persistence/Configurations/NavItemConfiguration.cs

@@ -39,7 +39,8 @@ public sealed class NavItemConfiguration : IEntityTypeConfiguration<NavItem>
             new NavItem { NavItemId = 10, Code = "help", Label = "Help", Href = "/dashboard/help", SortOrder = 10 },
             new NavItem { NavItemId = 11, Code = "ledgers", Label = "Ledgers", Href = "/dashboard/ledgers", SortOrder = 11 },
             new NavItem { NavItemId = 12, Code = "accounts", Label = "Accounts", Href = "/dashboard/accounts", SortOrder = 12 },
-            new NavItem { NavItemId = 13, Code = "sales", Label = "Sales", Href = "/dashboard/sales", SortOrder = 13 }
+            new NavItem { NavItemId = 13, Code = "sales", Label = "Sales", Href = "/dashboard/sales", SortOrder = 13 },
+            new NavItem { NavItemId = 14, Code = "production", Label = "Production", Href = "/dashboard/production", SortOrder = 14 }
         );
     }
 }

Backend/ERPCore/Infra/Persistence/Configurations/PermissionConfiguration.cs

@@ -61,7 +61,11 @@ public sealed class PermissionConfiguration : IEntityTypeConfiguration<Permissio
             new Permission { PermissionId = 26, Code = "NAV:accounts.bank-accounts", SubNavItemId = 15 },
             new Permission { PermissionId = 32, Code = "NAV:accounts", NavItemId = 12 },
             new Permission { PermissionId = 33, Code = "NAV:accounts.cheque-books", SubNavItemId = 21 },
-            new Permission { PermissionId = 34, Code = "NAV:accounts.received-cheques", SubNavItemId = 22 }
+            new Permission { PermissionId = 34, Code = "NAV:accounts.received-cheques", SubNavItemId = 22 },
+            new Permission { PermissionId = 35, Code = "NAV:production", NavItemId = 14 },
+            new Permission { PermissionId = 36, Code = "NAV:production.templates", SubNavItemId = 24 },
+            new Permission { PermissionId = 37, Code = "NAV:production.runs", SubNavItemId = 25 },
+            new Permission { PermissionId = 38, Code = "NAV:production.produced", SubNavItemId = 26 }
         );
     }
 }

Backend/ERPCore/Infra/Persistence/Configurations/PurchaseReturnConfiguration.cs

@@ -16,6 +16,7 @@ public sealed class PurchaseReturnConfiguration : IEntityTypeConfiguration<Purch
 
         builder.Property(r => r.Status).HasConversion<string>().HasMaxLength(20).IsRequired();
         builder.Property(r => r.CreatedAt).IsRequired();
+        builder.Property(r => r.GlJournalNo).HasMaxLength(30);
 
         builder.HasOne(r => r.Vendor).WithMany().HasForeignKey(r => r.VendorId).OnDelete(DeleteBehavior.Restrict);
         builder.HasOne(r => r.Warehouse).WithMany().HasForeignKey(r => r.WarehouseId).OnDelete(DeleteBehavior.Restrict);

Backend/ERPCore/Infra/Persistence/Configurations/SalesDayEndConfiguration.cs

@@ -0,0 +1,44 @@
+using ERPCore.Domain.Entities;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace ERPCore.Infra.Persistence.Configurations;
+
+public sealed class SalesDayEndConfiguration : IEntityTypeConfiguration<SalesDayEnd>
+{
+    public void Configure(EntityTypeBuilder<SalesDayEnd> builder)
+    {
+        builder.ToTable("sales_day_ends");
+        builder.HasKey(x => x.SalesDayEndId);
+
+        builder.Property(x => x.DocNo).IsRequired().HasMaxLength(30);
+        builder.HasIndex(x => x.DocNo).IsUnique();
+
+        builder.Property(x => x.BusinessDate).IsRequired();
+
+        foreach (var p in new[] { nameof(SalesDayEnd.Subtotal), nameof(SalesDayEnd.DiscountTotal), nameof(SalesDayEnd.TaxTotal), nameof(SalesDayEnd.GrandTotal), nameof(SalesDayEnd.CostOfGoodsSold) })
+            builder.Property<decimal>(p).HasPrecision(18, 4);
+        builder.Property(x => x.BundleCount).HasDefaultValue(0);
+
+        builder.Property(x => x.GlJournalNo).HasMaxLength(30);
+        builder.Property(x => x.ClosedAt).IsRequired();
+        builder.Property(x => x.RowVersion).IsRowVersion();
+
+        builder.HasOne(x => x.CashierUser).WithMany().HasForeignKey(x => x.CashierUserId).OnDelete(DeleteBehavior.Restrict);
+        builder.HasOne(x => x.ClosedByUser).WithMany().HasForeignKey(x => x.ClosedBy).OnDelete(DeleteBehavior.Restrict);
+
+        // A cashier can only close a given business date once (CloseAsync replays this
+        // row idempotently on a second call instead of erroring — see SalesDayEndService).
+        builder.HasIndex(x => new { x.CashierUserId, x.BusinessDate }).IsUnique();
+
+        builder.HasMany(x => x.Slips)
+            .WithOne(x => x.DayEnd)
+            .HasForeignKey(x => x.DayEndId)
+            .OnDelete(DeleteBehavior.Restrict);
+
+        builder.HasMany(x => x.BundleSales)
+            .WithOne(x => x.DayEnd)
+            .HasForeignKey(x => x.DayEndId)
+            .OnDelete(DeleteBehavior.Restrict);
+    }
+}

Backend/ERPCore/Infra/Persistence/Configurations/SalesInvoiceConfiguration.cs

@@ -40,6 +40,7 @@ public sealed class SalesInvoiceConfiguration : IEntityTypeConfiguration<SalesIn
 
         foreach (var p in new[] { nameof(SalesInvoice.Subtotal), nameof(SalesInvoice.DiscountTotal), nameof(SalesInvoice.TaxTotal), nameof(SalesInvoice.GrandTotal), nameof(SalesInvoice.RoundOff), nameof(SalesInvoice.NetPayable), nameof(SalesInvoice.PaidAmount), nameof(SalesInvoice.BalanceAmount) })
             builder.Property<decimal>(p).HasPrecision(18, 4);
+        builder.Property(x => x.GlJournalNo).HasMaxLength(30);
 
         builder.Property(x => x.CreatedAt).IsRequired();
         builder.Property(x => x.RowVersion).IsRowVersion();
@@ -54,6 +55,27 @@ public sealed class SalesInvoiceConfiguration : IEntityTypeConfiguration<SalesIn
     }
 }
 
+public sealed class SalesInvoicePaymentConfiguration : IEntityTypeConfiguration<SalesInvoicePayment>
+{
+    public void Configure(EntityTypeBuilder<SalesInvoicePayment> builder)
+    {
+        builder.ToTable("sales_invoice_payments");
+        builder.HasKey(p => p.SalesInvoicePaymentId);
+
+        builder.Property(p => p.Amount).HasPrecision(18, 4);
+        builder.Property(p => p.PaymentDate).IsRequired();
+        builder.Property(p => p.BankAccountName).IsRequired().HasMaxLength(200);
+        builder.Property(p => p.Reference).HasMaxLength(100);
+        builder.Property(p => p.GlJournalNo).HasMaxLength(30);
+        builder.Property(p => p.CreatedAt).IsRequired();
+
+        builder.HasOne(p => p.SalesInvoice).WithMany(x => x.Payments).HasForeignKey(p => p.SalesInvoiceId).OnDelete(DeleteBehavior.Restrict);
+        builder.HasOne(p => p.Creator).WithMany().HasForeignKey(p => p.CreatedBy).OnDelete(DeleteBehavior.Restrict);
+
+        builder.HasIndex(p => p.SalesInvoiceId);
+    }
+}
+
 public sealed class SalesInvoiceLineConfiguration : IEntityTypeConfiguration<SalesInvoiceLine>
 {
     public void Configure(EntityTypeBuilder<SalesInvoiceLine> builder)

Backend/ERPCore/Infra/Persistence/Configurations/SalesReturnConfiguration.cs

@@ -16,6 +16,7 @@ public sealed class SalesReturnConfiguration : IEntityTypeConfiguration<SalesRet
 
         builder.Property(r => r.Status).HasConversion<string>().HasMaxLength(20).IsRequired();
         builder.Property(r => r.CreatedAt).IsRequired();
+        builder.Property(r => r.GlJournalNo).HasMaxLength(30);
 
         builder.HasOne(r => r.Customer).WithMany().HasForeignKey(r => r.CustomerId).OnDelete(DeleteBehavior.Restrict);
         builder.HasOne(r => r.Warehouse).WithMany().HasForeignKey(r => r.WarehouseId).OnDelete(DeleteBehavior.Restrict);

Backend/ERPCore/Infra/Persistence/Configurations/StockAdjustmentConfiguration.cs

@@ -16,6 +16,7 @@ public sealed class StockAdjustmentConfiguration : IEntityTypeConfiguration<Stoc
 
         builder.Property(a => a.Status).HasConversion<string>().HasMaxLength(20).IsRequired();
         builder.Property(a => a.CreatedAt).IsRequired();
+        builder.Property(a => a.GlJournalNo).HasMaxLength(30);
         builder.Property(a => a.RowVersion).IsRowVersion();
 
         builder.HasOne(a => a.Warehouse).WithMany().HasForeignKey(a => a.WarehouseId).OnDelete(DeleteBehavior.Restrict);

Backend/ERPCore/Infra/Persistence/Configurations/SubNavItemConfiguration.cs

@@ -53,7 +53,11 @@ public sealed class SubNavItemConfiguration : IEntityTypeConfiguration<SubNavIte
             // doesn't silently lose it just because the section it lives under changed.
             new SubNavItem { SubNavItemId = 15, NavItemId = 12, Code = "accounts.bank-accounts", Label = "Cash / Bank Accounts", Href = "/dashboard/accounts/bank-accounts", SortOrder = 1 },
             new SubNavItem { SubNavItemId = 21, NavItemId = 12, Code = "accounts.cheque-books", Label = "Cheque Books", Href = "/dashboard/accounts/cheque-books", SortOrder = 2 },
-            new SubNavItem { SubNavItemId = 22, NavItemId = 12, Code = "accounts.received-cheques", Label = "Received Cheques", Href = "/dashboard/accounts/received-cheques", SortOrder = 3 }
+            new SubNavItem { SubNavItemId = 22, NavItemId = 12, Code = "accounts.received-cheques", Label = "Received Cheques", Href = "/dashboard/accounts/received-cheques", SortOrder = 3 },
+            // Production (NavItemId 14) children — mirror the sidebar order (AppSidebar.tsx).
+            new SubNavItem { SubNavItemId = 24, NavItemId = 14, Code = "production.templates", Label = "Templates", Href = "/dashboard/production/templates", SortOrder = 1 },
+            new SubNavItem { SubNavItemId = 25, NavItemId = 14, Code = "production.runs", Label = "Runs", Href = "/dashboard/production/runs", SortOrder = 2 },
+            new SubNavItem { SubNavItemId = 26, NavItemId = 14, Code = "production.produced", Label = "Produced", Href = "/dashboard/production/produced", SortOrder = 3 }
         );
     }
 }

Backend/ERPCore/Infra/Persistence/ErpDbContext.cs

@@ -63,6 +63,7 @@ public class ErpDbContext : DbContext
     // --- Goods Receipt (docs/10 Part C.3) ---
     public DbSet<Grn> Grns => Set<Grn>();
     public DbSet<GrnLine> GrnLines => Set<GrnLine>();
+    public DbSet<GrnPayment> GrnPayments => Set<GrnPayment>();
 
     // --- Batch / Serial (docs/10 Part C.4) ---
     public DbSet<Batch> Batches => Set<Batch>();
@@ -87,8 +88,10 @@ public class ErpDbContext : DbContext
     // --- Sales (Phase 1) ---
     public DbSet<SalesInvoice> SalesInvoices => Set<SalesInvoice>();
     public DbSet<SalesInvoiceLine> SalesInvoiceLines => Set<SalesInvoiceLine>();
+    public DbSet<SalesInvoicePayment> SalesInvoicePayments => Set<SalesInvoicePayment>();
     public DbSet<SalesSlip> SalesSlips => Set<SalesSlip>();
     public DbSet<SalesSlipLine> SalesSlipLines => Set<SalesSlipLine>();
+    public DbSet<SalesDayEnd> SalesDayEnds => Set<SalesDayEnd>();
     public DbSet<BundleSaleTemplate> BundleSaleTemplates => Set<BundleSaleTemplate>();
     public DbSet<BundleSaleTemplateLine> BundleSaleTemplateLines => Set<BundleSaleTemplateLine>();
     public DbSet<BundleSale> BundleSales => Set<BundleSale>();

Backend/ERPCore/Migrations/20260812091117_AddGrnGlPostingAndPayments.cs

@@ -0,0 +1,113 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace ERPCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddGrnGlPostingAndPayments : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<decimal>(
+                name: "BalanceAmount",
+                table: "grns",
+                type: "numeric(18,4)",
+                precision: 18,
+                scale: 4,
+                nullable: false,
+                defaultValue: 0m);
+
+            migrationBuilder.AddColumn<string>(
+                name: "GlJournalNo",
+                table: "grns",
+                type: "character varying(30)",
+                maxLength: 30,
+                nullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "GlPostedAt",
+                table: "grns",
+                type: "timestamp with time zone",
+                nullable: true);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "PaidAmount",
+                table: "grns",
+                type: "numeric(18,4)",
+                precision: 18,
+                scale: 4,
+                nullable: false,
+                defaultValue: 0m);
+
+            migrationBuilder.CreateTable(
+                name: "grn_payments",
+                columns: table => new
+                {
+                    GrnPaymentId = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    GrnId = table.Column<int>(type: "integer", nullable: false),
+                    Amount = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
+                    PaymentDate = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
+                    GlBankAccountId = table.Column<long>(type: "bigint", nullable: false),
+                    BankAccountName = table.Column<string>(type: "character varying(200)", maxLength: 200, nullable: false),
+                    Reference = table.Column<string>(type: "character varying(100)", maxLength: 100, nullable: true),
+                    GlJournalNo = table.Column<string>(type: "character varying(30)", maxLength: 30, nullable: true),
+                    CreatedBy = table.Column<int>(type: "integer", nullable: false),
+                    CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_grn_payments", x => x.GrnPaymentId);
+                    table.ForeignKey(
+                        name: "FK_grn_payments_grns_GrnId",
+                        column: x => x.GrnId,
+                        principalTable: "grns",
+                        principalColumn: "GrnId",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_grn_payments_users_CreatedBy",
+                        column: x => x.CreatedBy,
+                        principalTable: "users",
+                        principalColumn: "UserId",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_grn_payments_CreatedBy",
+                table: "grn_payments",
+                column: "CreatedBy");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_grn_payments_GrnId",
+                table: "grn_payments",
+                column: "GrnId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "grn_payments");
+
+            migrationBuilder.DropColumn(
+                name: "BalanceAmount",
+                table: "grns");
+
+            migrationBuilder.DropColumn(
+                name: "GlJournalNo",
+                table: "grns");
+
+            migrationBuilder.DropColumn(
+                name: "GlPostedAt",
+                table: "grns");
+
+            migrationBuilder.DropColumn(
+                name: "PaidAmount",
+                table: "grns");
+        }
+    }
+}

Backend/ERPCore/Migrations/20260816130723_AddSalesDayEnd.cs

@@ -0,0 +1,109 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace ERPCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddSalesDayEnd : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "DayEndId",
+                table: "sales_slips",
+                type: "integer",
+                nullable: true);
+
+            migrationBuilder.CreateTable(
+                name: "sales_day_ends",
+                columns: table => new
+                {
+                    SalesDayEndId = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    DocNo = table.Column<string>(type: "character varying(30)", maxLength: 30, nullable: false),
+                    CashierUserId = table.Column<int>(type: "integer", nullable: false),
+                    BusinessDate = table.Column<DateOnly>(type: "date", nullable: false),
+                    SlipCount = table.Column<int>(type: "integer", nullable: false),
+                    Subtotal = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
+                    DiscountTotal = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
+                    TaxTotal = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
+                    GrandTotal = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
+                    CostOfGoodsSold = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
+                    GlJournalNo = table.Column<string>(type: "character varying(30)", maxLength: 30, nullable: true),
+                    GlPostedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
+                    ClosedBy = table.Column<int>(type: "integer", nullable: false),
+                    ClosedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
+                    xmin = table.Column<uint>(type: "xid", rowVersion: true, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_sales_day_ends", x => x.SalesDayEndId);
+                    table.ForeignKey(
+                        name: "FK_sales_day_ends_users_CashierUserId",
+                        column: x => x.CashierUserId,
+                        principalTable: "users",
+                        principalColumn: "UserId",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_sales_day_ends_users_ClosedBy",
+                        column: x => x.ClosedBy,
+                        principalTable: "users",
+                        principalColumn: "UserId",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_sales_slips_DayEndId",
+                table: "sales_slips",
+                column: "DayEndId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_sales_day_ends_CashierUserId_BusinessDate",
+                table: "sales_day_ends",
+                columns: new[] { "CashierUserId", "BusinessDate" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_sales_day_ends_ClosedBy",
+                table: "sales_day_ends",
+                column: "ClosedBy");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_sales_day_ends_DocNo",
+                table: "sales_day_ends",
+                column: "DocNo",
+                unique: true);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_sales_slips_sales_day_ends_DayEndId",
+                table: "sales_slips",
+                column: "DayEndId",
+                principalTable: "sales_day_ends",
+                principalColumn: "SalesDayEndId",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_sales_slips_sales_day_ends_DayEndId",
+                table: "sales_slips");
+
+            migrationBuilder.DropTable(
+                name: "sales_day_ends");
+
+            migrationBuilder.DropIndex(
+                name: "IX_sales_slips_DayEndId",
+                table: "sales_slips");
+
+            migrationBuilder.DropColumn(
+                name: "DayEndId",
+                table: "sales_slips");
+        }
+    }
+}

Backend/ERPCore/Migrations/20260816133305_AddReturnGlPosting.cs

@@ -0,0 +1,61 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ERPCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddReturnGlPosting : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "GlJournalNo",
+                table: "sales_returns",
+                type: "character varying(30)",
+                maxLength: 30,
+                nullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "GlPostedAt",
+                table: "sales_returns",
+                type: "timestamp with time zone",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "GlJournalNo",
+                table: "purchase_returns",
+                type: "character varying(30)",
+                maxLength: 30,
+                nullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "GlPostedAt",
+                table: "purchase_returns",
+                type: "timestamp with time zone",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "GlJournalNo",
+                table: "sales_returns");
+
+            migrationBuilder.DropColumn(
+                name: "GlPostedAt",
+                table: "sales_returns");
+
+            migrationBuilder.DropColumn(
+                name: "GlJournalNo",
+                table: "purchase_returns");
+
+            migrationBuilder.DropColumn(
+                name: "GlPostedAt",
+                table: "purchase_returns");
+        }
+    }
+}

Backend/ERPCore/Migrations/20260816142234_AddAdjustmentGlPosting.cs

@@ -0,0 +1,40 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ERPCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddAdjustmentGlPosting : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "GlJournalNo",
+                table: "stock_adjustments",
+                type: "character varying(30)",
+                maxLength: 30,
+                nullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "GlPostedAt",
+                table: "stock_adjustments",
+                type: "timestamp with time zone",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "GlJournalNo",
+                table: "stock_adjustments");
+
+            migrationBuilder.DropColumn(
+                name: "GlPostedAt",
+                table: "stock_adjustments");
+        }
+    }
+}

Backend/ERPCore/Migrations/20260816151344_AddBundleSaleToDayEnd.cs

@@ -0,0 +1,60 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ERPCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddBundleSaleToDayEnd : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "BundleCount",
+                table: "sales_day_ends",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "DayEndId",
+                table: "bundle_sales",
+                type: "integer",
+                nullable: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_bundle_sales_DayEndId",
+                table: "bundle_sales",
+                column: "DayEndId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_bundle_sales_sales_day_ends_DayEndId",
+                table: "bundle_sales",
+                column: "DayEndId",
+                principalTable: "sales_day_ends",
+                principalColumn: "SalesDayEndId",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_bundle_sales_sales_day_ends_DayEndId",
+                table: "bundle_sales");
+
+            migrationBuilder.DropIndex(
+                name: "IX_bundle_sales_DayEndId",
+                table: "bundle_sales");
+
+            migrationBuilder.DropColumn(
+                name: "BundleCount",
+                table: "sales_day_ends");
+
+            migrationBuilder.DropColumn(
+                name: "DayEndId",
+                table: "bundle_sales");
+        }
+    }
+}

Backend/ERPCore/Migrations/20260816174034_AddSalesInvoicePayments.cs

@@ -0,0 +1,87 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace ERPCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddSalesInvoicePayments : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "GlJournalNo",
+                table: "sales_invoices",
+                type: "character varying(30)",
+                maxLength: 30,
+                nullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "GlPostedAt",
+                table: "sales_invoices",
+                type: "timestamp with time zone",
+                nullable: true);
+
+            migrationBuilder.CreateTable(
+                name: "sales_invoice_payments",
+                columns: table => new
+                {
+                    SalesInvoicePaymentId = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    SalesInvoiceId = table.Column<int>(type: "integer", nullable: false),
+                    Amount = table.Column<decimal>(type: "numeric(18,4)", precision: 18, scale: 4, nullable: false),
+                    PaymentDate = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
+                    GlBankAccountId = table.Column<long>(type: "bigint", nullable: false),
+                    BankAccountName = table.Column<string>(type: "character varying(200)", maxLength: 200, nullable: false),
+                    Reference = table.Column<string>(type: "character varying(100)", maxLength: 100, nullable: true),
+                    GlJournalNo = table.Column<string>(type: "character varying(30)", maxLength: 30, nullable: true),
+                    CreatedBy = table.Column<int>(type: "integer", nullable: false),
+                    CreatedAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_sales_invoice_payments", x => x.SalesInvoicePaymentId);
+                    table.ForeignKey(
+                        name: "FK_sales_invoice_payments_sales_invoices_SalesInvoiceId",
+                        column: x => x.SalesInvoiceId,
+                        principalTable: "sales_invoices",
+                        principalColumn: "SalesInvoiceId",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_sales_invoice_payments_users_CreatedBy",
+                        column: x => x.CreatedBy,
+                        principalTable: "users",
+                        principalColumn: "UserId",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_sales_invoice_payments_CreatedBy",
+                table: "sales_invoice_payments",
+                column: "CreatedBy");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_sales_invoice_payments_SalesInvoiceId",
+                table: "sales_invoice_payments",
+                column: "SalesInvoiceId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "sales_invoice_payments");
+
+            migrationBuilder.DropColumn(
+                name: "GlJournalNo",
+                table: "sales_invoices");
+
+            migrationBuilder.DropColumn(
+                name: "GlPostedAt",
+                table: "sales_invoices");
+        }
+    }
+}

Backend/ERPCore/Migrations/20260818090139_AddProductionNavPermissions.cs

@@ -0,0 +1,90 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional
+
+namespace ERPCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddProductionNavPermissions : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.InsertData(
+                table: "nav_items",
+                columns: new[] { "NavItemId", "Code", "Href", "Icon", "Label", "SortOrder" },
+                values: new object[] { 14, "production", "/dashboard/production", null, "Production", 14 });
+
+            migrationBuilder.InsertData(
+                table: "permissions",
+                columns: new[] { "PermissionId", "Code", "NavItemId", "SubNavItemId" },
+                values: new object[] { 35, "NAV:production", 14, null });
+
+            migrationBuilder.InsertData(
+                table: "sub_nav_items",
+                columns: new[] { "SubNavItemId", "Code", "Href", "Icon", "Label", "NavItemId", "SortOrder" },
+                values: new object[,]
+                {
+                    { 24, "production.templates", "/dashboard/production/templates", null, "Templates", 14, 1 },
+                    { 25, "production.runs", "/dashboard/production/runs", null, "Runs", 14, 2 },
+                    { 26, "production.produced", "/dashboard/production/produced", null, "Produced", 14, 3 }
+                });
+
+            migrationBuilder.InsertData(
+                table: "permissions",
+                columns: new[] { "PermissionId", "Code", "NavItemId", "SubNavItemId" },
+                values: new object[,]
+                {
+                    { 36, "NAV:production.templates", null, 24 },
+                    { 37, "NAV:production.runs", null, 25 },
+                    { 38, "NAV:production.produced", null, 26 }
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DeleteData(
+                table: "permissions",
+                keyColumn: "PermissionId",
+                keyValue: 35);
+
+            migrationBuilder.DeleteData(
+                table: "permissions",
+                keyColumn: "PermissionId",
+                keyValue: 36);
+
+            migrationBuilder.DeleteData(
+                table: "permissions",
+                keyColumn: "PermissionId",
+                keyValue: 37);
+
+            migrationBuilder.DeleteData(
+                table: "permissions",
+                keyColumn: "PermissionId",
+                keyValue: 38);
+
+            migrationBuilder.DeleteData(
+                table: "sub_nav_items",
+                keyColumn: "SubNavItemId",
+                keyValue: 24);
+
+            migrationBuilder.DeleteData(
+                table: "sub_nav_items",
+                keyColumn: "SubNavItemId",
+                keyValue: 25);
+
+            migrationBuilder.DeleteData(
+                table: "sub_nav_items",
+                keyColumn: "SubNavItemId",
+                keyValue: 26);
+
+            migrationBuilder.DeleteData(
+                table: "nav_items",
+                keyColumn: "NavItemId",
+                keyValue: 14);
+        }
+    }
+}

Backend/ERPCore/Migrations/ErpDbContextModelSnapshot.cs

@@ -422,6 +422,9 @@ namespace ERPCore.Migrations
                         .HasMaxLength(200)
                         .HasColumnType("character varying(200)");
 
+                    b.Property<int?>("DayEndId")
+                        .HasColumnType("integer");
+
                     b.Property<decimal>("DiscountTotal")
                         .HasPrecision(18, 4)
                         .HasColumnType("numeric(18,4)");
@@ -462,6 +465,8 @@ namespace ERPCore.Migrations
 
                     b.HasIndex("CustomerId");
 
+                    b.HasIndex("DayEndId");
+
                     b.HasIndex("WarehouseId");
 
                     b.ToTable("bundle_sales", (string)null);
@@ -1406,6 +1411,10 @@ namespace ERPCore.Migrations
 
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GrnId"));
 
+                    b.Property<decimal>("BalanceAmount")
+                        .HasPrecision(18, 4)
+                        .HasColumnType("numeric(18,4)");
+
                     b.Property<DateTime>("CreatedAt")
                         .HasColumnType("timestamp with time zone");
 
@@ -1417,6 +1426,17 @@ namespace ERPCore.Migrations
                         .HasMaxLength(30)
                         .HasColumnType("character varying(30)");
 
+                    b.Property<string>("GlJournalNo")
+                        .HasMaxLength(30)
+                        .HasColumnType("character varying(30)");
+
+                    b.Property<DateTime?>("GlPostedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<decimal>("PaidAmount")
+                        .HasPrecision(18, 4)
+                        .HasColumnType("numeric(18,4)");
+
                     b.Property<int?>("PoId")
                         .HasColumnType("integer");
 
@@ -1564,6 +1584,55 @@ namespace ERPCore.Migrations
                     b.ToTable("grn_line_warranty_numbers", (string)null);
                 });
 
+            modelBuilder.Entity("ERPCore.Domain.Entities.GrnPayment", b =>
+                {
+                    b.Property<int>("GrnPaymentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("GrnPaymentId"));
+
+                    b.Property<decimal>("Amount")
+                        .HasPrecision(18, 4)
+                        .HasColumnType("numeric(18,4)");
+
+                    b.Property<string>("BankAccountName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("CreatedBy")
+                        .HasColumnType("integer");
+
+                    b.Property<long>("GlBankAccountId")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("GlJournalNo")
+                        .HasMaxLength(30)
+                        .HasColumnType("character varying(30)");
+
+                    b.Property<int>("GrnId")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("PaymentDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Reference")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.HasKey("GrnPaymentId");
+
+                    b.HasIndex("CreatedBy");
+
+                    b.HasIndex("GrnId");
+
+                    b.ToTable("grn_payments", (string)null);
+                });
+
             modelBuilder.Entity("ERPCore.Domain.Entities.HrDocumentType", b =>
                 {
                     b.Property<int>("HrDocumentTypeId")
@@ -2265,6 +2334,15 @@ namespace ERPCore.Migrations
                             Label = "Sales",
                             SortOrder = 13,
                             Status = "Active"
+                        },
+                        new
+                        {
+                            NavItemId = 14,
+                            Code = "production",
+                            Href = "/dashboard/production",
+                            Label = "Production",
+                            SortOrder = 14,
+                            Status = "Active"
                         });
                 });
 
@@ -2811,6 +2889,30 @@ namespace ERPCore.Migrations
                             PermissionId = 34,
                             Code = "NAV:accounts.received-cheques",
                             SubNavItemId = 22
+                        },
+                        new
+                        {
+                            PermissionId = 35,
+                            Code = "NAV:production",
+                            NavItemId = 14
+                        },
+                        new
+                        {
+                            PermissionId = 36,
+                            Code = "NAV:production.templates",
+                            SubNavItemId = 24
+                        },
+                        new
+                        {
+                            PermissionId = 37,
+                            Code = "NAV:production.runs",
+                            SubNavItemId = 25
+                        },
+                        new
+                        {
+                            PermissionId = 38,
+                            Code = "NAV:production.produced",
+                            SubNavItemId = 26
                         });
                 });
 
@@ -3107,6 +3209,13 @@ namespace ERPCore.Migrations
                         .HasMaxLength(30)
                         .HasColumnType("character varying(30)");
 
+                    b.Property<string>("GlJournalNo")
+                        .HasMaxLength(30)
+                        .HasColumnType("character varying(30)");
+
+                    b.Property<DateTime?>("GlPostedAt")
+                        .HasColumnType("timestamp with time zone");
+
                     b.Property<int>("ReasonCodeId")
                         .HasColumnType("integer");
 
@@ -3712,6 +3821,85 @@ namespace ERPCore.Migrations
                     b.ToTable("hr_salary_components", (string)null);
                 });
 
+            modelBuilder.Entity("ERPCore.Domain.Entities.SalesDayEnd", b =>
+                {
+                    b.Property<int>("SalesDayEndId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("SalesDayEndId"));
+
+                    b.Property<int>("BundleCount")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(0);
+
+                    b.Property<DateOnly>("BusinessDate")
+                        .HasColumnType("date");
+
+                    b.Property<int>("CashierUserId")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("ClosedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("ClosedBy")
+                        .HasColumnType("integer");
+
+                    b.Property<decimal>("CostOfGoodsSold")
+                        .HasPrecision(18, 4)
+                        .HasColumnType("numeric(18,4)");
+
+                    b.Property<decimal>("DiscountTotal")
+                        .HasPrecision(18, 4)
+                        .HasColumnType("numeric(18,4)");
+
+                    b.Property<string>("DocNo")
+                        .IsRequired()
+                        .HasMaxLength(30)
+                        .HasColumnType("character varying(30)");
+
+                    b.Property<string>("GlJournalNo")
+                        .HasMaxLength(30)
+                        .HasColumnType("character varying(30)");
+
+                    b.Property<DateTime?>("GlPostedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<decimal>("GrandTotal")
+                        .HasPrecision(18, 4)
+                        .HasColumnType("numeric(18,4)");
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.Property<int>("SlipCount")
+                        .HasColumnType("integer");
+
+                    b.Property<decimal>("Subtotal")
+                        .HasPrecision(18, 4)
+                        .HasColumnType("numeric(18,4)");
+
+                    b.Property<decimal>("TaxTotal")
+                        .HasPrecision(18, 4)
+                        .HasColumnType("numeric(18,4)");
+
+                    b.HasKey("SalesDayEndId");
+
+                    b.HasIndex("ClosedBy");
+
+                    b.HasIndex("DocNo")
+                        .IsUnique();
+
+                    b.HasIndex("CashierUserId", "BusinessDate")
+                        .IsUnique();
+
+                    b.ToTable("sales_day_ends", (string)null);
+                });
+
             modelBuilder.Entity("ERPCore.Domain.Entities.SalesInvoice", b =>
                 {
                     b.Property<int>("SalesInvoiceId")
@@ -3749,6 +3937,13 @@ namespace ERPCore.Migrations
                         .HasPrecision(18, 4)
                         .HasColumnType("numeric(18,4)");
 
+                    b.Property<string>("GlJournalNo")
+                        .HasMaxLength(30)
+                        .HasColumnType("character varying(30)");
+
+                    b.Property<DateTime?>("GlPostedAt")
+                        .HasColumnType("timestamp with time zone");
+
                     b.Property<decimal>("GrandTotal")
                         .HasPrecision(18, 4)
                         .HasColumnType("numeric(18,4)");
@@ -3918,6 +4113,55 @@ namespace ERPCore.Migrations
                     b.ToTable("sales_invoice_lines", (string)null);
                 });
 
+            modelBuilder.Entity("ERPCore.Domain.Entities.SalesInvoicePayment", b =>
+                {
+                    b.Property<int>("SalesInvoicePaymentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("SalesInvoicePaymentId"));
+
+                    b.Property<decimal>("Amount")
+                        .HasPrecision(18, 4)
+                        .HasColumnType("numeric(18,4)");
+
+                    b.Property<string>("BankAccountName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("CreatedBy")
+                        .HasColumnType("integer");
+
+                    b.Property<long>("GlBankAccountId")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("GlJournalNo")
+                        .HasMaxLength(30)
+                        .HasColumnType("character varying(30)");
+
+                    b.Property<DateTime>("PaymentDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Reference")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<int>("SalesInvoiceId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("SalesInvoicePaymentId");
+
+                    b.HasIndex("CreatedBy");
+
+                    b.HasIndex("SalesInvoiceId");
+
+                    b.ToTable("sales_invoice_payments", (string)null);
+                });
+
             modelBuilder.Entity("ERPCore.Domain.Entities.SalesReturn", b =>
                 {
                     b.Property<int>("ReturnId")
@@ -3940,6 +4184,13 @@ namespace ERPCore.Migrations
                         .HasMaxLength(30)
                         .HasColumnType("character varying(30)");
 
+                    b.Property<string>("GlJournalNo")
+                        .HasMaxLength(30)
+                        .HasColumnType("character varying(30)");
+
+                    b.Property<DateTime?>("GlPostedAt")
+                        .HasColumnType("timestamp with time zone");
+
                     b.Property<int>("ReasonCodeId")
                         .HasColumnType("integer");
 
@@ -4025,6 +4276,9 @@ namespace ERPCore.Migrations
                         .HasMaxLength(200)
                         .HasColumnType("character varying(200)");
 
+                    b.Property<int?>("DayEndId")
+                        .HasColumnType("integer");
+
                     b.Property<decimal>("DiscountTotal")
                         .HasPrecision(18, 4)
                         .HasColumnType("numeric(18,4)");
@@ -4078,6 +4332,8 @@ namespace ERPCore.Migrations
 
                     b.HasIndex("CustomerId");
 
+                    b.HasIndex("DayEndId");
+
                     b.HasIndex("SlipDate");
 
                     b.HasIndex("SlipNo")
@@ -4339,6 +4595,13 @@ namespace ERPCore.Migrations
                         .HasMaxLength(30)
                         .HasColumnType("character varying(30)");
 
+                    b.Property<string>("GlJournalNo")
+                        .HasMaxLength(30)
+                        .HasColumnType("character varying(30)");
+
+                    b.Property<DateTime?>("GlPostedAt")
+                        .HasColumnType("timestamp with time zone");
+
                     b.Property<int>("ReasonCodeId")
                         .HasColumnType("integer");
 
@@ -5066,6 +5329,36 @@ namespace ERPCore.Migrations
                             NavItemId = 12,
                             SortOrder = 3,
                             Status = "Active"
+                        },
+                        new
+                        {
+                            SubNavItemId = 24,
+                            Code = "production.templates",
+                            Href = "/dashboard/production/templates",
+                            Label = "Templates",
+                            NavItemId = 14,
+                            SortOrder = 1,
+                            Status = "Active"
+                        },
+                        new
+                        {
+                            SubNavItemId = 25,
+                            Code = "production.runs",
+                            Href = "/dashboard/production/runs",
+                            Label = "Runs",
+                            NavItemId = 14,
+                            SortOrder = 2,
+                            Status = "Active"
+                        },
+                        new
+                        {
+                            SubNavItemId = 26,
+                            Code = "production.produced",
+                            Href = "/dashboard/production/produced",
+                            Label = "Produced",
+                            NavItemId = 14,
+                            SortOrder = 3,
+                            Status = "Active"
                         });
                 });
 
@@ -5527,6 +5820,11 @@ namespace ERPCore.Migrations
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
 
+                    b.HasOne("ERPCore.Domain.Entities.SalesDayEnd", "DayEnd")
+                        .WithMany("BundleSales")
+                        .HasForeignKey("DayEndId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
                     b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
                         .WithMany()
                         .HasForeignKey("WarehouseId")
@@ -5539,6 +5837,8 @@ namespace ERPCore.Migrations
 
                     b.Navigation("Customer");
 
+                    b.Navigation("DayEnd");
+
                     b.Navigation("Warehouse");
                 });
 
@@ -5842,6 +6142,25 @@ namespace ERPCore.Migrations
                     b.Navigation("GrnLine");
                 });
 
+            modelBuilder.Entity("ERPCore.Domain.Entities.GrnPayment", b =>
+                {
+                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
+                        .WithMany()
+                        .HasForeignKey("CreatedBy")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("ERPCore.Domain.Entities.Grn", "Grn")
+                        .WithMany("Payments")
+                        .HasForeignKey("GrnId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Creator");
+
+                    b.Navigation("Grn");
+                });
+
             modelBuilder.Entity("ERPCore.Domain.Entities.Item", b =>
                 {
                     b.HasOne("ERPCore.Domain.Entities.Uom", "BaseUom")
@@ -6415,6 +6734,25 @@ namespace ERPCore.Migrations
                     b.Navigation("Uom");
                 });
 
+            modelBuilder.Entity("ERPCore.Domain.Entities.SalesDayEnd", b =>
+                {
+                    b.HasOne("ERPCore.Domain.Entities.User", "CashierUser")
+                        .WithMany()
+                        .HasForeignKey("CashierUserId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("ERPCore.Domain.Entities.User", "ClosedByUser")
+                        .WithMany()
+                        .HasForeignKey("ClosedBy")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("CashierUser");
+
+                    b.Navigation("ClosedByUser");
+                });
+
             modelBuilder.Entity("ERPCore.Domain.Entities.SalesInvoice", b =>
                 {
                     b.HasOne("ERPCore.Domain.Entities.User", "Creator")
@@ -6467,6 +6805,25 @@ namespace ERPCore.Migrations
                     b.Navigation("Warehouse");
                 });
 
+            modelBuilder.Entity("ERPCore.Domain.Entities.SalesInvoicePayment", b =>
+                {
+                    b.HasOne("ERPCore.Domain.Entities.User", "Creator")
+                        .WithMany()
+                        .HasForeignKey("CreatedBy")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("ERPCore.Domain.Entities.SalesInvoice", "SalesInvoice")
+                        .WithMany("Payments")
+                        .HasForeignKey("SalesInvoiceId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Creator");
+
+                    b.Navigation("SalesInvoice");
+                });
+
             modelBuilder.Entity("ERPCore.Domain.Entities.SalesReturn", b =>
                 {
                     b.HasOne("ERPCore.Domain.Entities.User", "Creator")
@@ -6542,6 +6899,11 @@ namespace ERPCore.Migrations
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
 
+                    b.HasOne("ERPCore.Domain.Entities.SalesDayEnd", "DayEnd")
+                        .WithMany("Slips")
+                        .HasForeignKey("DayEndId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
                     b.HasOne("ERPCore.Domain.Entities.Warehouse", "Warehouse")
                         .WithMany()
                         .HasForeignKey("WarehouseId")
@@ -6552,6 +6914,8 @@ namespace ERPCore.Migrations
 
                     b.Navigation("Customer");
 
+                    b.Navigation("DayEnd");
+
                     b.Navigation("Warehouse");
                 });
 
@@ -7025,6 +7389,8 @@ namespace ERPCore.Migrations
             modelBuilder.Entity("ERPCore.Domain.Entities.Grn", b =>
                 {
                     b.Navigation("Lines");
+
+                    b.Navigation("Payments");
                 });
 
             modelBuilder.Entity("ERPCore.Domain.Entities.GrnLine", b =>
@@ -7101,9 +7467,18 @@ namespace ERPCore.Migrations
                     b.Navigation("Outputs");
                 });
 
+            modelBuilder.Entity("ERPCore.Domain.Entities.SalesDayEnd", b =>
+                {
+                    b.Navigation("BundleSales");
+
+                    b.Navigation("Slips");
+                });
+
             modelBuilder.Entity("ERPCore.Domain.Entities.SalesInvoice", b =>
                 {
                     b.Navigation("Lines");
+
+                    b.Navigation("Payments");
                 });
 
             modelBuilder.Entity("ERPCore.Domain.Entities.SalesReturn", b =>

Backend/ERPCore/Program.cs

@@ -103,6 +103,7 @@ builder.Services.AddScoped<IItemMeasure, ItemMeasure>();
 builder.Services.AddScoped<IFifoCostingService, FifoCostingService>();
 builder.Services.AddScoped<IStockService, StockService>();
 builder.Services.AddScoped<IGrnService, GrnService>();
+builder.Services.AddScoped<IGrnPaymentService, GrnPaymentService>();
 
 // Sales (Phase 1)
 builder.Services.AddScoped<ISalesPricingService, SalesPricingService>();
@@ -111,11 +112,13 @@ builder.Services.AddScoped<ISalesPostingService, SalesPostingService>();
 builder.Services.AddScoped<ISalesDocumentWorkflowService, SalesDocumentWorkflowService>();
 builder.Services.AddScoped<ISalesMappingService, SalesMappingService>();
 builder.Services.AddScoped<ISalesInvoiceService, SalesInvoiceService>();
+builder.Services.AddScoped<ISalesInvoicePaymentService, SalesInvoicePaymentService>();
 builder.Services.AddScoped<ISalesSlipService, SalesSlipService>();
 builder.Services.AddScoped<IBundleSaleService, BundleSaleService>();
 builder.Services.AddScoped<ISalesPromotionSuggestionService, SalesPromotionSuggestionService>();
 builder.Services.AddScoped<ISalesReportService, SalesReportService>();
 builder.Services.AddScoped<ISalesReturnService, SalesReturnService>();
+builder.Services.AddScoped<ISalesDayEndService, SalesDayEndService>();
 
 // Stock transactions + reference data (docs/11 §5–6)
 builder.Services.AddScoped<IStockMutator, StockMutator>();

Backend/ERPCore/Services/AdjustmentService.cs

@@ -6,6 +6,7 @@ using ERPCore.Dtos.Stock;
 using ERPCore.Infra.Auth;
 using ERPCore.Infra.UoW;
 using ERPCore.Repositories.Interfaces;
+using ERPCore.Services.Gl;
 using ERPCore.Services.Interfaces;
 using ERPCore.System.Errors;
 using Microsoft.EntityFrameworkCore;
@@ -16,7 +17,10 @@ namespace ERPCore.Services;
 /// Stock-adjustment service — the highest-risk feature (02-SECURITY C.5). Auto-posts
 /// with a mandatory reason code and user stamp. Line application (FIFO consume on a
 /// decrease, layer create on an increase) + ledger posting is delegated to
-/// <see cref="IStockMutator"/>. Runs in a single UoW transaction (NFR-02/05).
+/// <see cref="IStockMutator"/>. Runs in a single UoW transaction (NFR-02/05). Also posts
+/// a real GL journal entry — increases and decreases post as separate Inventory/Gain and
+/// Loss/Inventory lines respectively (never netted against each other), so a count that's
+/// simultaneously over on one item and under on another shows both, not a false net.
 /// </summary>
 public sealed class AdjustmentService : IAdjustmentService
 {
@@ -29,11 +33,16 @@ public sealed class AdjustmentService : IAdjustmentService
     private readonly INumberSequenceService _numbers;
     private readonly ICurrentUser _currentUser;
     private readonly IUnitOfWork _uow;
+    private readonly IGeneralLedgerService _gl;
+    private readonly string _glInventoryAccountCode;
+    private readonly string _glGainAccountCode;
+    private readonly string _glLossAccountCode;
 
     public AdjustmentService(
         IRepository<StockAdjustment> adjustments, IRepository<Warehouse> warehouses, IRepository<Item> items,
         IRepository<ReasonCode> reasonCodes, IRepository<StockLedger> ledger, IStockMutator mutator,
-        INumberSequenceService numbers, ICurrentUser currentUser, IUnitOfWork uow)
+        INumberSequenceService numbers, ICurrentUser currentUser, IUnitOfWork uow,
+        IGeneralLedgerService gl, IConfiguration configuration)
     {
         _adjustments = adjustments;
         _warehouses = warehouses;
@@ -44,6 +53,45 @@ public sealed class AdjustmentService : IAdjustmentService
         _numbers = numbers;
         _currentUser = currentUser;
         _uow = uow;
+        _gl = gl;
+        _glInventoryAccountCode = configuration["Adjustment:GlInventoryAccountCode"] ?? string.Empty;
+        _glGainAccountCode = configuration["Adjustment:GlGainAccountCode"] ?? string.Empty;
+        _glLossAccountCode = configuration["Adjustment:GlLossAccountCode"] ?? string.Empty;
+    }
+
+    /// <summary>Builds and posts the GL journal for a <see cref="StockAdjustment"/>'s stock movement.
+    /// <see cref="CountService"/>'s variance posting mirrors this exact logic for the same reason
+    /// (it creates a <see cref="StockAdjustment"/> through the same <see cref="IStockMutator"/> call).</summary>
+    private async Task<string?> PostAdjustmentJournalAsync(
+        string docNo, DateTime now, IReadOnlyList<StockLedger> refs, CancellationToken ct)
+    {
+        var gain = refs.Where(r => r.Direction == Direction.In).Sum(r => r.Value);
+        var loss = refs.Where(r => r.Direction == Direction.Out).Sum(r => r.Value);
+        if (gain <= 0 && loss <= 0) return null;
+
+        var period = await _gl.GetPeriodByDateAsync(DateOnly.FromDateTime(now), ct);
+        var lines = new List<GlJournalEntryLineRequest>();
+        if (gain > 0)
+        {
+            lines.Add(new GlJournalEntryLineRequest(_glInventoryAccountCode, gain, 0m, $"Adjustment {docNo} — stock increase"));
+            lines.Add(new GlJournalEntryLineRequest(_glGainAccountCode, 0m, gain, $"Adjustment {docNo} — inventory gain"));
+        }
+        if (loss > 0)
+        {
+            lines.Add(new GlJournalEntryLineRequest(_glLossAccountCode, loss, 0m, $"Adjustment {docNo} — inventory loss"));
+            lines.Add(new GlJournalEntryLineRequest(_glInventoryAccountCode, 0m, loss, $"Adjustment {docNo} — stock decrease"));
+        }
+
+        var result = await _gl.PostJournalEntryAsync(new GlJournalEntryRequest
+        {
+            PeriodId = period.PeriodId,
+            EntryDate = DateOnly.FromDateTime(now),
+            SourceModule = "ADJUSTMENT",
+            Reference = docNo,
+            Narration = $"Stock adjustment {docNo}",
+            Lines = lines
+        }, ct);
+        return result.JournalNo;
     }
 
     public async Task<PagedResponse<AdjustmentSummaryDto>> ListAsync(
@@ -64,7 +112,7 @@ public sealed class AdjustmentService : IAdjustmentService
             .Skip(query.Skip).Take(query.PageSize)
             .Select(a => new AdjustmentSummaryDto(
                 a.AdjustmentId, a.DocNo, a.WarehouseId, a.ReasonCodeId, a.Status,
-                a.CreatedBy, a.CreatedAt, a.Lines.Count))
+                a.CreatedBy, a.CreatedAt, a.Lines.Count, a.GlJournalNo))
             .ToListAsync(ct);
 
         return PagedResponse<AdjustmentSummaryDto>.Create(rows, query.Page, query.PageSize, total);
@@ -136,6 +184,10 @@ public sealed class AdjustmentService : IAdjustmentService
             await _uow.SaveChangesAsync(token); // flush so AdjustmentId is a valid ledger sourceDocId
 
             var refs = await _mutator.ApplyAsync(request.WarehouseId, DocumentTypes.Adjustment, entity.AdjustmentId, now, deltas, token);
+
+            entity.GlJournalNo = await PostAdjustmentJournalAsync(docNo, now, refs, token);
+            if (entity.GlJournalNo is not null) entity.GlPostedAt = now;
+
             return (entity, refs);
         }, ct);
 
@@ -144,6 +196,7 @@ public sealed class AdjustmentService : IAdjustmentService
 
     private static AdjustmentDto ToDto(StockAdjustment a, IReadOnlyList<int> ledgerRefs) => new(
         a.AdjustmentId, a.DocNo, a.WarehouseId, a.ReasonCodeId, a.Status, a.CreatedBy, a.CreatedAt,
+        a.GlJournalNo, a.GlPostedAt,
         a.Lines.OrderBy(l => l.AdjLineId)
             .Select(l => new AdjustmentLineDto(l.AdjLineId, l.ItemId, l.BinId, l.BatchId, l.QtyDelta)).ToList(),
         ledgerRefs);

Backend/ERPCore/Services/BundleSaleService.cs

@@ -17,6 +17,7 @@ public sealed class BundleSaleService : IBundleSaleService
 {
     private readonly IRepository<BundleSaleTemplate> _templates;
     private readonly IRepository<BundleSale> _bundles;
+    private readonly IRepository<SalesDayEnd> _dayEnds;
     private readonly IRepository<Customer> _customers;
     private readonly IRepository<Item> _items;
     private readonly IRepository<Warehouse> _warehouses;
@@ -30,6 +31,7 @@ public sealed class BundleSaleService : IBundleSaleService
     public BundleSaleService(
         IRepository<BundleSale> bundles,
         IRepository<BundleSaleTemplate> templates,
+        IRepository<SalesDayEnd> dayEnds,
         IRepository<Customer> customers,
         IRepository<Item> items,
         IRepository<Warehouse> warehouses,
@@ -42,6 +44,7 @@ public sealed class BundleSaleService : IBundleSaleService
     {
         _templates = templates;
         _bundles = bundles;
+        _dayEnds = dayEnds;
         _customers = customers;
         _items = items;
         _warehouses = warehouses;
@@ -110,6 +113,15 @@ public sealed class BundleSaleService : IBundleSaleService
     public async Task<BundleSaleDto> CreateAsync(CreateBundleSaleRequest request, CancellationToken ct = default)
     {
         await _sales.ValidateSalesHeaderAsync(request.CustomerId, request.WarehouseId, request.CashierUserId, true, ct);
+
+        // Same guard as SalesSlipService.CreateAsync — a bundle sale is a cashier document
+        // exactly like a sales slip, so it's blocked by the same closed day (docs/14 Sales Day End).
+        var today = DateOnly.FromDateTime(DateTime.UtcNow);
+        var alreadyClosed = await _dayEnds.Query().AsNoTracking()
+            .AnyAsync(x => x.CashierUserId == request.CashierUserId && x.BusinessDate == today, ct);
+        if (alreadyClosed)
+            throw new ConflictException($"Cashier {request.CashierUserId} already closed today's ({today:yyyy-MM-dd}) sales — day-end has been posted.");
+
         var template = await _templates.Query().AsNoTracking().Include(x => x.Lines)
             .FirstAsync(x => x.BundleSaleTemplateId == request.BundleSaleTemplateId, ct);
         var bundle = new BundleSale

Backend/ERPCore/Services/CountService.cs

@@ -6,6 +6,7 @@ using ERPCore.Dtos.Stock;
 using ERPCore.Infra.Auth;
 using ERPCore.Infra.UoW;
 using ERPCore.Repositories.Interfaces;
+using ERPCore.Services.Gl;
 using ERPCore.Services.Interfaces;
 using ERPCore.System.Errors;
 using Microsoft.EntityFrameworkCore;
@@ -16,7 +17,9 @@ namespace ERPCore.Services;
 /// Stock-count service (FR-STK-08). Create snapshots system quantities (immutable,
 /// 02-SECURITY C.7); posting emits a variance <see cref="StockAdjustment"/> via the
 /// shared <see cref="IStockMutator"/> (a variance is an adjustment in disguise, C.7)
-/// and closes the count — all in one UoW transaction.
+/// and closes the count — all in one UoW transaction. GL posting for that variance
+/// mirrors <see cref="AdjustmentService"/>'s (same account config, same gain/loss
+/// split) since it's the exact same kind of document under the hood.
 /// </summary>
 public sealed class CountService : ICountService
 {
@@ -32,11 +35,16 @@ public sealed class CountService : ICountService
     private readonly INumberSequenceService _numbers;
     private readonly ICurrentUser _currentUser;
     private readonly IUnitOfWork _uow;
+    private readonly IGeneralLedgerService _gl;
+    private readonly string _glInventoryAccountCode;
+    private readonly string _glGainAccountCode;
+    private readonly string _glLossAccountCode;
 
     public CountService(
         IRepository<StockCount> counts, IRepository<StockAdjustment> adjustments, IRepository<Warehouse> warehouses,
         IRepository<Item> items, IRepository<ReasonCode> reasonCodes, IFifoCostingService fifo, IStockMutator mutator,
-        INumberSequenceService numbers, ICurrentUser currentUser, IUnitOfWork uow)
+        INumberSequenceService numbers, ICurrentUser currentUser, IUnitOfWork uow,
+        IGeneralLedgerService gl, IConfiguration configuration)
     {
         _counts = counts;
         _adjustments = adjustments;
@@ -48,6 +56,44 @@ public sealed class CountService : ICountService
         _numbers = numbers;
         _currentUser = currentUser;
         _uow = uow;
+        _gl = gl;
+        _glInventoryAccountCode = configuration["Adjustment:GlInventoryAccountCode"] ?? string.Empty;
+        _glGainAccountCode = configuration["Adjustment:GlGainAccountCode"] ?? string.Empty;
+        _glLossAccountCode = configuration["Adjustment:GlLossAccountCode"] ?? string.Empty;
+    }
+
+    /// <summary>Same logic as <c>AdjustmentService</c>'s private method of the same name — see there for why
+    /// gains/losses post as separate lines instead of a net.</summary>
+    private async Task<string?> PostAdjustmentJournalAsync(
+        string docNo, DateTime now, IReadOnlyList<StockLedger> refs, CancellationToken ct)
+    {
+        var gain = refs.Where(r => r.Direction == Direction.In).Sum(r => r.Value);
+        var loss = refs.Where(r => r.Direction == Direction.Out).Sum(r => r.Value);
+        if (gain <= 0 && loss <= 0) return null;
+
+        var period = await _gl.GetPeriodByDateAsync(DateOnly.FromDateTime(now), ct);
+        var lines = new List<GlJournalEntryLineRequest>();
+        if (gain > 0)
+        {
+            lines.Add(new GlJournalEntryLineRequest(_glInventoryAccountCode, gain, 0m, $"Adjustment {docNo} — stock increase"));
+            lines.Add(new GlJournalEntryLineRequest(_glGainAccountCode, 0m, gain, $"Adjustment {docNo} — inventory gain"));
+        }
+        if (loss > 0)
+        {
+            lines.Add(new GlJournalEntryLineRequest(_glLossAccountCode, loss, 0m, $"Adjustment {docNo} — inventory loss"));
+            lines.Add(new GlJournalEntryLineRequest(_glInventoryAccountCode, 0m, loss, $"Adjustment {docNo} — stock decrease"));
+        }
+
+        var result = await _gl.PostJournalEntryAsync(new GlJournalEntryRequest
+        {
+            PeriodId = period.PeriodId,
+            EntryDate = DateOnly.FromDateTime(now),
+            SourceModule = "ADJUSTMENT",
+            Reference = docNo,
+            Narration = $"Stock adjustment {docNo}",
+            Lines = lines
+        }, ct);
+        return result.JournalNo;
     }
 
     public async Task<PagedResponse<CountSummaryDto>> ListAsync(
@@ -160,7 +206,7 @@ public sealed class CountService : ICountService
         {
             count.Status = CountStatus.Posted;
             await _uow.SaveChangesAsync(ct);
-            return new CountPostResultDto(count.CountId, count.Status, null, Array.Empty<int>());
+            return new CountPostResultDto(count.CountId, count.Status, null, null, Array.Empty<int>());
         }
 
         var reason = await _reasonCodes.Query().AsNoTracking()
@@ -168,7 +214,7 @@ public sealed class CountService : ICountService
             ?? throw new DomainException(ErrorCodes.Validation, $"Reason code '{VarianceReasonCode}' (Count Variance) is not configured.", 422);
 
         var now = DateTime.UtcNow;
-        var (adjustmentId, ledgerEntries) = await _uow.ExecuteInTransactionAsync(async token =>
+        var (adjustmentId, glJournalNo, ledgerEntries) = await _uow.ExecuteInTransactionAsync(async token =>
         {
             var docNo = await _numbers.NextAsync(DocumentTypes.Adjustment, token);
             var adjustment = new StockAdjustment
@@ -191,12 +237,15 @@ public sealed class CountService : ICountService
 
             var refs = await _mutator.ApplyAsync(count.WarehouseId, DocumentTypes.Adjustment, adjustment.AdjustmentId, now, deltas, token);
 
+            adjustment.GlJournalNo = await PostAdjustmentJournalAsync(docNo, now, refs, token);
+            if (adjustment.GlJournalNo is not null) adjustment.GlPostedAt = now;
+
             count.Status = CountStatus.Posted;
-            return (adjustment.AdjustmentId, refs);
+            return (adjustment.AdjustmentId, adjustment.GlJournalNo, refs);
         }, ct);
 
         // Map ledger ids after commit so they are populated.
-        return new CountPostResultDto(count.CountId, count.Status, adjustmentId, ledgerEntries.Select(r => r.LedgerId).ToList());
+        return new CountPostResultDto(count.CountId, count.Status, adjustmentId, glJournalNo, ledgerEntries.Select(r => r.LedgerId).ToList());
     }
 
     private static CountDto Map(StockCount c) => new(

Backend/ERPCore/Services/GeneralLedgerService.cs

@@ -1,11 +1,21 @@
+using System.Text;
+using System.Text.Json;
 using ERPCore.Infra.Gl;
+using ERPCore.Services.Gl;
 using ERPCore.Services.Interfaces;
+using ERPCore.System.Errors;
 
 namespace ERPCore.Services;
 
 /// <inheritdoc cref="IGeneralLedgerService"/>
 public sealed class GeneralLedgerService : IGeneralLedgerService
 {
+    private static readonly JsonSerializerOptions JsonOptions = new()
+    {
+        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+        PropertyNameCaseInsensitive = true
+    };
+
     private readonly IGeneralLedgerClient _client;
 
     public GeneralLedgerService(IGeneralLedgerClient client) => _client = client;
@@ -13,4 +23,89 @@ public sealed class GeneralLedgerService : IGeneralLedgerService
     public Task<GeneralLedgerResponse> ForwardAsync(
         HttpMethod method, string path, string? queryString, string? contentType, Stream? body, CancellationToken ct)
         => _client.SendAsync(method, path, queryString, contentType, body, ct);
+
+    public async Task<GlJournalEntryResult> PostJournalEntryAsync(GlJournalEntryRequest request, CancellationToken ct)
+    {
+        using var body = new MemoryStream(JsonSerializer.SerializeToUtf8Bytes(request, JsonOptions));
+        var response = await _client.SendAsync(HttpMethod.Post, "journal-entries", null, "application/json", body, ct);
+        var data = ParseSuccess<GlJournalEntryData>(response);
+        return new GlJournalEntryResult(data.JournalNo, data.IsPosted);
+    }
+
+    public async Task<GlPeriod> GetPeriodByDateAsync(DateOnly date, CancellationToken ct)
+    {
+        var response = await _client.SendAsync(
+            HttpMethod.Get, "fiscal-years/periods/by-date", $"?date={date:yyyy-MM-dd}", null, null, ct);
+        var data = ParseSuccess<GlPeriodData>(response);
+        return new GlPeriod(data.PeriodId, data.FiscalYearId);
+    }
+
+    public async Task<IReadOnlyList<GlBankAccount>> ListBankAccountsAsync(CancellationToken ct)
+    {
+        var response = await _client.SendAsync(HttpMethod.Get, "bank-accounts", "?accountType=Both", null, null, ct);
+        var data = ParseSuccess<List<GlBankAccountData>>(response);
+        return data.Select(a => new GlBankAccount(
+            a.AccountType, a.AccountId, a.AccountName, a.BankName,
+            a.CashAccountTypeName, a.AccountNumber, a.GlAccountId, a.GlAccountCode, a.CurrencyCode)).ToList();
+    }
+
+    /// <summary>
+    /// Parses GL's <c>ApiResponse</c> envelope (case-insensitively, since GL's success bodies are
+    /// camelCase and its error bodies are PascalCase — docs/12 §4) and throws
+    /// <see cref="DomainException"/> if the call didn't succeed.
+    /// </summary>
+    private static T ParseSuccess<T>(GeneralLedgerResponse response)
+    {
+        GlEnvelope<T>? envelope;
+        try
+        {
+            envelope = JsonSerializer.Deserialize<GlEnvelope<T>>(response.Body, JsonOptions);
+        }
+        catch (JsonException)
+        {
+            envelope = null;
+        }
+
+        if (response.StatusCode is < 200 or >= 300 || envelope is null || !envelope.Success || envelope.Data is null)
+        {
+            var message = envelope?.Message ?? "The General Ledger service rejected the request.";
+            var status = response.StatusCode is >= 400 and < 500 ? response.StatusCode : 502;
+            throw new DomainException(ErrorCodes.GlRequestFailed, message, status);
+        }
+
+        return envelope.Data;
+    }
+
+    private sealed class GlEnvelope<T>
+    {
+        public int StatusCode { get; set; }
+        public bool Success { get; set; }
+        public string? Message { get; set; }
+        public T? Data { get; set; }
+    }
+
+    private sealed class GlJournalEntryData
+    {
+        public string JournalNo { get; set; } = string.Empty;
+        public bool IsPosted { get; set; }
+    }
+
+    private sealed class GlPeriodData
+    {
+        public int PeriodId { get; set; }
+        public int FiscalYearId { get; set; }
+    }
+
+    private sealed class GlBankAccountData
+    {
+        public string AccountType { get; set; } = string.Empty;
+        public long AccountId { get; set; }
+        public string AccountName { get; set; } = string.Empty;
+        public string? BankName { get; set; }
+        public string? CashAccountTypeName { get; set; }
+        public string? AccountNumber { get; set; }
+        public long GlAccountId { get; set; }
+        public string GlAccountCode { get; set; } = string.Empty;
+        public string CurrencyCode { get; set; } = string.Empty;
+    }
 }

Backend/ERPCore/Services/Gl/GlModels.cs

@@ -0,0 +1,27 @@
+namespace ERPCore.Services.Gl;
+
+/// <summary>
+/// Purpose-built request/response shapes for the specific GL endpoints ERPCore's GRN
+/// module calls directly (journal-entries, period lookup, bank-account listing) — not
+/// a full model of GL's contract (docs/12-GENERAL-LEDGER-INTEGRATION.md §5/§6: typed
+/// DTOs are added only for the flow that actually needs them).
+/// </summary>
+public sealed record GlJournalEntryLineRequest(string AccountCode, decimal DebitAmount, decimal CreditAmount, string? Memo = null);
+
+public sealed class GlJournalEntryRequest
+{
+    public int PeriodId { get; set; }
+    public DateOnly EntryDate { get; set; }
+    public string? SourceModule { get; set; }
+    public string? Reference { get; set; }
+    public string? Narration { get; set; }
+    public List<GlJournalEntryLineRequest> Lines { get; set; } = new();
+}
+
+public sealed record GlJournalEntryResult(string JournalNo, bool IsPosted);
+
+public sealed record GlPeriod(int PeriodId, int FiscalYearId);
+
+public sealed record GlBankAccount(
+    string AccountType, long AccountId, string AccountName, string? BankName,
+    string? CashAccountTypeName, string? AccountNumber, long GlAccountId, string GlAccountCode, string CurrencyCode);

Backend/ERPCore/Services/GrnPaymentService.cs

@@ -0,0 +1,120 @@
+using ERPCore.Domain.Entities;
+using ERPCore.Domain.Enums;
+using ERPCore.Dtos.Grn;
+using ERPCore.Infra.Auth;
+using ERPCore.Infra.UoW;
+using ERPCore.Repositories.Interfaces;
+using ERPCore.Services.Gl;
+using ERPCore.Services.Interfaces;
+using ERPCore.System.Errors;
+using Microsoft.EntityFrameworkCore;
+
+namespace ERPCore.Services;
+
+/// <summary>
+/// Vendor payments against a confirmed GRN. Multiple installments are allowed until
+/// <see cref="Grn.BalanceAmount"/> reaches zero. Each payment posts its own real GL
+/// journal entry (Debit GRN Clearing / Credit the selected bank-or-cash account) before
+/// being recorded, using the same call-GL-before-commit pattern as <see cref="GrnService.ConfirmAsync"/>
+/// so a rejected/unreachable GL post rolls back the whole payment atomically.
+/// </summary>
+public sealed class GrnPaymentService : IGrnPaymentService
+{
+    private readonly IRepository<Grn> _grns;
+    private readonly IRepository<GrnPayment> _payments;
+    private readonly IGeneralLedgerService _gl;
+    private readonly ICurrentUser _currentUser;
+    private readonly IUnitOfWork _uow;
+    private readonly string _glClearingAccountCode;
+
+    public GrnPaymentService(
+        IRepository<Grn> grns, IRepository<GrnPayment> payments, IGeneralLedgerService gl,
+        ICurrentUser currentUser, IUnitOfWork uow, IConfiguration configuration)
+    {
+        _grns = grns;
+        _payments = payments;
+        _gl = gl;
+        _currentUser = currentUser;
+        _uow = uow;
+        _glClearingAccountCode = configuration["Grn:GlClearingAccountCode"] ?? string.Empty;
+    }
+
+    public async Task<GrnPaymentDto> PayAsync(int grnId, CreateGrnPaymentRequest request, CancellationToken ct = default)
+    {
+        var grn = await _grns.Query().FirstOrDefaultAsync(g => g.GrnId == grnId, ct)
+            ?? throw new NotFoundException($"GRN {grnId} was not found.");
+
+        if (grn.Status == GrnStatus.Draft)
+            throw new DomainException(ErrorCodes.GrnNotPayable, $"GRN {grnId} must be confirmed before it can be paid.", 409);
+        if (request.Amount > grn.BalanceAmount)
+            throw new DomainException(ErrorCodes.GrnPaymentExceedsBalance,
+                $"Payment amount {request.Amount} exceeds the remaining balance {grn.BalanceAmount}.", 400);
+
+        var accounts = await _gl.ListBankAccountsAsync(ct);
+        var account = accounts.FirstOrDefault(a => a.AccountId == request.GlBankAccountId)
+            ?? throw new DomainException(ErrorCodes.GrnBankAccountNotFound, $"Bank/cash account {request.GlBankAccountId} was not found.", 404);
+
+        var actor = _currentUser.AuditUserId;
+        var now = DateTime.UtcNow;
+
+        var payment = await _uow.ExecuteInTransactionAsync(async token =>
+        {
+            // Same atomicity approach as GrnService.ConfirmAsync: post to GL first, inside
+            // this transaction, before anything is committed — a GL rejection/timeout rolls
+            // the whole payment back with no partial local state.
+            var period = await _gl.GetPeriodByDateAsync(DateOnly.FromDateTime(now), token);
+            var posted = await _gl.PostJournalEntryAsync(new GlJournalEntryRequest
+            {
+                PeriodId = period.PeriodId,
+                EntryDate = DateOnly.FromDateTime(now),
+                SourceModule = "GRN_PAYMENT",
+                Reference = grn.DocNo,
+                Narration = $"Payment against GRN {grn.DocNo}",
+                Lines =
+                [
+                    new GlJournalEntryLineRequest(_glClearingAccountCode, request.Amount, 0m, $"Payment against GRN {grn.DocNo}"),
+                    new GlJournalEntryLineRequest(account.GlAccountCode, 0m, request.Amount, $"Payment against GRN {grn.DocNo}")
+                ]
+            }, token);
+
+            var entity = new GrnPayment
+            {
+                GrnId = grn.GrnId,
+                Amount = request.Amount,
+                PaymentDate = now,
+                GlBankAccountId = account.AccountId,
+                BankAccountName = account.AccountName,
+                Reference = request.Reference,
+                GlJournalNo = posted.JournalNo,
+                CreatedBy = actor,
+                CreatedAt = now
+            };
+            await _payments.AddAsync(entity, token);
+
+            grn.PaidAmount += request.Amount;
+            grn.BalanceAmount -= request.Amount;
+
+            return entity;
+        }, ct);
+
+        return Map(payment);
+    }
+
+    public async Task<IReadOnlyList<GrnPaymentDto>> ListAsync(int grnId, CancellationToken ct = default)
+    {
+        if (!await _grns.Query().AnyAsync(g => g.GrnId == grnId, ct))
+            throw new NotFoundException($"GRN {grnId} was not found.");
+
+        return await _payments.Query().AsNoTracking()
+            .Where(p => p.GrnId == grnId)
+            .OrderByDescending(p => p.GrnPaymentId)
+            .Select(p => new GrnPaymentDto(
+                p.GrnPaymentId, p.GrnId, p.Amount, p.PaymentDate,
+                p.GlBankAccountId, p.BankAccountName, p.Reference, p.GlJournalNo, p.CreatedAt))
+            .ToListAsync(ct);
+    }
+
+    private static GrnPaymentDto Map(GrnPayment p) => new(
+        p.GrnPaymentId, p.GrnId, p.Amount, p.PaymentDate,
+        p.GlBankAccountId, p.BankAccountName, p.Reference, p.GlJournalNo, p.CreatedAt);
+}

Backend/ERPCore/Services/GrnService.cs

@@ -6,6 +6,7 @@ using ERPCore.Dtos.Grn;
 using ERPCore.Infra.Auth;
 using ERPCore.Infra.UoW;
 using ERPCore.Repositories.Interfaces;
+using ERPCore.Services.Gl;
 using ERPCore.Services.Interfaces;
 using ERPCore.System.Errors;
 using Microsoft.EntityFrameworkCore;
@@ -38,13 +39,18 @@ public sealed class GrnService : IGrnService
     private readonly INumberSequenceService _numbers;
     private readonly ICurrentUser _currentUser;
     private readonly IUnitOfWork _uow;
+    private readonly IGeneralLedgerService _gl;
+    private readonly string _glInventoryAccountCode;
+    private readonly string _glVatRecoverableAccountCode;
+    private readonly string _glClearingAccountCode;
 
     public GrnService(
         IRepository<Grn> grns, IRepository<PurchaseOrder> pos, IRepository<PoLine> poLines,
         IRepository<Item> items, IRepository<Warehouse> warehouses,
         IRepository<Bin> bins, IRepository<Vendor> vendors, IRepository<Batch> batches,
         IRepository<StockLayer> layers, IRepository<StockLedger> ledger,
-        IFifoCostingService fifo, INumberSequenceService numbers, ICurrentUser currentUser, IUnitOfWork uow)
+        IFifoCostingService fifo, INumberSequenceService numbers, ICurrentUser currentUser, IUnitOfWork uow,
+        IGeneralLedgerService gl, IConfiguration configuration)
     {
         _grns = grns;
         _pos = pos;
@@ -60,6 +66,10 @@ public sealed class GrnService : IGrnService
         _numbers = numbers;
         _currentUser = currentUser;
         _uow = uow;
+        _gl = gl;
+        _glInventoryAccountCode = configuration["Grn:GlInventoryAccountCode"] ?? string.Empty;
+        _glVatRecoverableAccountCode = configuration["Grn:GlVatRecoverableAccountCode"] ?? string.Empty;
+        _glClearingAccountCode = configuration["Grn:GlClearingAccountCode"] ?? string.Empty;
     }
 
     public async Task<PagedResponse<GrnSummaryDto>> ListAsync(
@@ -82,7 +92,7 @@ public sealed class GrnService : IGrnService
             .Skip(query.Skip).Take(query.PageSize)
             .Select(g => new GrnSummaryDto(
                 g.GrnId, g.DocNo, g.PoId, g.VendorId, g.WarehouseId, g.Status,
-                g.CreatedBy, g.CreatedAt, g.PostedAt, g.Lines.Count))
+                g.CreatedBy, g.CreatedAt, g.PostedAt, g.Lines.Count, g.PaidAmount, g.BalanceAmount))
             .ToListAsync(ct);
 
         return PagedResponse<GrnSummaryDto>.Create(rows, query.Page, query.PageSize, total);
@@ -260,15 +270,47 @@ public sealed class GrnService : IGrnService
                 }
             }
 
+            // Post the real GL journal entry for this receipt before committing — if GL
+            // rejects it or is unreachable, the exception propagates out of this callback
+            // and the whole transaction (FIFO layers, stock ledger, PO accrual) rolls back
+            // with it, so inventory and the ledger never diverge (user-approved "fails
+            // atomically" behavior; residual risk if GL posts but the local commit still
+            // fails afterward is accepted for this phase, see the integration plan).
+            var period = await _gl.GetPeriodByDateAsync(DateOnly.FromDateTime(now), token);
+            var glLines = new List<GlJournalEntryLineRequest>();
+            decimal totalPayable = 0m;
+            foreach (var line in grn.Lines.OrderBy(l => l.GrnLineId))
+            {
+                glLines.Add(new GlJournalEntryLineRequest(_glInventoryAccountCode, line.ReceivedValue, 0m, $"GRN {grn.DocNo} line {line.GrnLineId}"));
+                if (line.VatAmount > 0)
+                    glLines.Add(new GlJournalEntryLineRequest(_glVatRecoverableAccountCode, line.VatAmount, 0m, $"GRN {grn.DocNo} line {line.GrnLineId} VAT"));
+                totalPayable += line.LineTotal;
+            }
+            glLines.Add(new GlJournalEntryLineRequest(_glClearingAccountCode, 0m, totalPayable, $"GRN {grn.DocNo} received"));
+
+            var posted = await _gl.PostJournalEntryAsync(new GlJournalEntryRequest
+            {
+                PeriodId = period.PeriodId,
+                EntryDate = DateOnly.FromDateTime(now),
+                SourceModule = "GRN",
+                Reference = grn.DocNo,
+                Narration = $"Goods received - GRN {grn.DocNo}",
+                Lines = glLines
+            }, token);
+
             grn.Status = GrnStatus.Confirmed;
             grn.PostedAt = now;
+            grn.GlJournalNo = posted.JournalNo;
+            grn.GlPostedAt = now;
+            grn.PaidAmount = 0m;
+            grn.BalanceAmount = totalPayable;
 
             await UpdatePoStatusAsync(grn.PoId, token);
             return 0;
         }, ct);
 
         return new GrnConfirmResultDto(
-            grn.GrnId, grn.Status, now,
+            grn.GrnId, grn.Status, now, grn.GlJournalNo ?? string.Empty, grn.BalanceAmount,
             createdLayers.Select(ToCreatedLayer).ToList(),
             ledgerRefs.Select(l => l.LedgerId).ToList(),
             await GetPoStatusAsync(grn.PoId, ct));
@@ -395,7 +437,7 @@ public sealed class GrnService : IGrnService
             .Select(l => l.LedgerId).ToListAsync(ct);
 
         return new GrnConfirmResultDto(
-            grn.GrnId, grn.Status, grn.PostedAt ?? grn.CreatedAt,
+            grn.GrnId, grn.Status, grn.PostedAt ?? grn.CreatedAt, grn.GlJournalNo ?? string.Empty, grn.BalanceAmount,
             layers.Select(ToCreatedLayer).ToList(), ledgerRefs, await GetPoStatusAsync(grn.PoId, ct));
     }
 
@@ -404,6 +446,7 @@ public sealed class GrnService : IGrnService
 
     private static GrnDto Map(Grn g) => new(
         g.GrnId, g.DocNo, g.PoId, g.VendorId, g.WarehouseId, g.Status, g.CreatedBy, g.CreatedAt, g.PostedAt,
+        g.GlJournalNo, g.PaidAmount, g.BalanceAmount,
         g.Lines.OrderBy(l => l.GrnLineId).Select(l => new GrnLineDto(
             l.GrnLineId, l.PoLineId, l.ItemId, l.BinId, l.Qty, l.UnitCost, l.PoUnitPrice,
             l.DiscountPct, l.NetUnitCost, l.VatPct, l.VatAmount, l.ReceivedValue, l.LineTotal,

Backend/ERPCore/Services/Interfaces/IGeneralLedgerService.cs

@@ -1,16 +1,27 @@
 using ERPCore.Infra.Gl;
+using ERPCore.Services.Gl;
 
 namespace ERPCore.Services.Interfaces;
 
 /// <summary>
 /// Single entry point into the external General Ledger service — the one function
 /// used both by <see cref="ERPCore.Controllers.GeneralLedgerController"/> (frontend
-/// requests, forwarded verbatim) and, once wired, other ERPCore services that need to
-/// post directly to GL (e.g. GRN confirm, adjustments — docs/12-GENERAL-LEDGER-INTEGRATION.md).
-/// No business logic lives here yet; this pass only connects the transport.
+/// requests, forwarded verbatim) and by other ERPCore services that post directly to
+/// GL (docs/12-GENERAL-LEDGER-INTEGRATION.md §5/§6). <see cref="ForwardAsync"/> stays a
+/// byte-for-byte passthrough; the three typed methods below are the first internal
+/// callers (GRN receipt + payment posting) and model only what those flows need.
 /// </summary>
 public interface IGeneralLedgerService
 {
     Task<GeneralLedgerResponse> ForwardAsync(
         HttpMethod method, string path, string? queryString, string? contentType, Stream? body, CancellationToken ct);
+
+    /// <summary>Creates and posts a balanced journal entry. Throws <see cref="ERPCore.System.Errors.DomainException"/> on rejection/unreachability.</summary>
+    Task<GlJournalEntryResult> PostJournalEntryAsync(GlJournalEntryRequest request, CancellationToken ct);
+
+    /// <summary>Resolves the accounting period covering <paramref name="date"/>.</summary>
+    Task<GlPeriod> GetPeriodByDateAsync(DateOnly date, CancellationToken ct);
+
+    /// <summary>Lists GL's cash and bank accounts (default: both types).</summary>
+    Task<IReadOnlyList<GlBankAccount>> ListBankAccountsAsync(CancellationToken ct);
 }

Backend/ERPCore/Services/Interfaces/IGrnPaymentService.cs

@@ -0,0 +1,10 @@
+using ERPCore.Dtos.Grn;
+
+namespace ERPCore.Services.Interfaces;
+
+/// <summary>Vendor payments against a confirmed GRN's balance (installments allowed).</summary>
+public interface IGrnPaymentService
+{
+    Task<GrnPaymentDto> PayAsync(int grnId, CreateGrnPaymentRequest request, CancellationToken ct = default);
+    Task<IReadOnlyList<GrnPaymentDto>> ListAsync(int grnId, CancellationToken ct = default);
+}

Backend/ERPCore/Services/Interfaces/IProductionRunService.cs

@@ -18,6 +18,15 @@ public interface IProductionRunService
 
     Task<ETagged<RunGraphDto>?> GetAsync(int runId, CancellationToken ct = default);
 
+    /// <summary>
+    /// Produced-items report (FR-MFG-13): one row per run that has produced something,
+    /// terminal-output quantities and roll-up cost, plus a summary total over every
+    /// filtered row. No pagination — bounded by the filters like the Sales reports.
+    /// </summary>
+    Task<ProducedListResponseDto> ListProducedAsync(
+        DateOnly? from, DateOnly? to, int? templateId, int? warehouseId, ProductionRunStatus? status,
+        CancellationToken ct = default);
+
     /// <summary>
     /// Instantiates a template (FR-MFG-08): copies every stage, input, output and edge,
     /// scales all quantities by <c>targetQty / terminalOutputQtyPerBatch</c>, issues a

Backend/ERPCore/Services/Interfaces/ISalesDayEndService.cs

@@ -0,0 +1,20 @@
+using ERPCore.Dtos.Common;
+using ERPCore.Dtos.Sales;
+
+namespace ERPCore.Services.Interfaces;
+
+public interface ISalesDayEndService
+{
+    /// <summary>What closing <paramref name="businessDate"/> for this cashier would include right now
+    /// (or the already-closed record's totals, if it's already closed).</summary>
+    Task<SalesDayEndPreviewDto> PreviewAsync(int cashierUserId, DateOnly businessDate, CancellationToken ct = default);
+
+    /// <summary>Closes the day: locks every Posted slip for (CashierUserId, BusinessDate) against this
+    /// record and posts one consolidated GL journal entry. Idempotent — a second call for an
+    /// already-closed date replays the existing record rather than erroring.</summary>
+    Task<SalesDayEndDto> CloseAsync(CreateSalesDayEndRequest request, CancellationToken ct = default);
+
+    Task<PagedResponse<SalesDayEndSummaryDto>> ListAsync(PageQuery query, int? cashierUserId, CancellationToken ct = default);
+
+    Task<SalesDayEndDto?> GetAsync(int salesDayEndId, CancellationToken ct = default);
+}

Backend/ERPCore/Services/Interfaces/ISalesInvoicePaymentService.cs

@@ -0,0 +1,10 @@
+using ERPCore.Dtos.Sales;
+
+namespace ERPCore.Services.Interfaces;
+
+/// <summary>Customer payments against a Posted sales invoice's balance (installments allowed).</summary>
+public interface ISalesInvoicePaymentService
+{
+    Task<SalesInvoicePaymentDto> PayAsync(int salesInvoiceId, CreateSalesInvoicePaymentRequest request, CancellationToken ct = default);
+    Task<IReadOnlyList<SalesInvoicePaymentDto>> ListAsync(int salesInvoiceId, CancellationToken ct = default);
+}

Backend/ERPCore/Services/Production/ProductionRunService.cs

@@ -16,6 +16,17 @@ namespace ERPCore.Services.Production;
 
 /// <summary>
 /// Production run lifecycle (docs/30 §D.2–D.3, FR-MFG-08..19).
+///
+/// Deliberately posts no GL journal entry anywhere in this file, for the same reason
+/// as <see cref="TransferService"/>: every movement here — raw material consumed
+/// (<see cref="StartStageAsync"/>), finished goods received (<see cref="PostReceiptAsync"/>),
+/// leftovers/cancellation returned to stock — stays inside the single shared Inventory
+/// GL account (raw materials, WIP, and finished goods are not separate GL accounts in
+/// this chart of accounts). And unlike a real write-off, scrap here is never removed
+/// from the cost pool — <see cref="PostReceiptAsync"/> divides the full consumed value
+/// by the GOOD quantity only, so a scrapped unit's cost is absorbed into the surviving
+/// units' cost rather than expensed. So there is no value entering, leaving, or being
+/// destroyed anywhere in a run — nothing for a journal entry to say.
 /// </summary>
 public sealed class ProductionRunService : IProductionRunService
 {
@@ -113,6 +124,75 @@ public sealed class ProductionRunService : IProductionRunService
         return PagedResponse<RunSummaryDto>.Create(items, query.Page, query.PageSize, total);
     }
 
+    public async Task<ProducedListResponseDto> ListProducedAsync(
+        DateOnly? from, DateOnly? to, int? templateId, int? warehouseId, ProductionRunStatus? status,
+        CancellationToken ct = default)
+    {
+        var q = _runs.Query().AsNoTracking()
+            // FR-MFG-05 (ProductionGraphValidator) guarantees exactly one item-bearing
+            // output per run, always the terminal one — a row exists once that output has
+            // actually produced something.
+            .Where(r => r.Stages.Any(s => s.Outputs.Any(o => o.ItemId != null && o.ProducedQty > 0)));
+
+        if (from is not null) q = q.Where(r => r.CreatedAt >= from.Value.ToDateTime(TimeOnly.MinValue));
+        if (to is not null) q = q.Where(r => r.CreatedAt < to.Value.AddDays(1).ToDateTime(TimeOnly.MinValue));
+        if (templateId is not null) q = q.Where(r => r.TemplateId == templateId);
+        if (warehouseId is not null) q = q.Where(r => r.WarehouseId == warehouseId);
+        if (status is not null) q = q.Where(r => r.Status == status);
+
+        // Projected to an anonymous type first, then mapped client-side — EF Core 10 cannot
+        // translate a record constructor call inside a projection alongside aggregates (same
+        // failure mode noted in ListAsync above).
+        var rows = await q
+            .OrderByDescending(r => r.RunId)
+            .Select(r => new
+            {
+                r.RunId,
+                r.DocNo,
+                r.Status,
+                r.TemplateId,
+                TemplateName = r.Template!.Name,
+                r.WarehouseId,
+                WarehouseName = r.Warehouse!.Name,
+                Output = r.Stages.SelectMany(s => s.Outputs)
+                    .Where(o => o.ItemId != null)
+                    .Select(o => new { o.ItemId, ItemName = o.Item!.Name, o.ProducedQty, o.ScrappedQty })
+                    .First(),
+                ConsumedValue = r.Stages.SelectMany(s => s.Inputs).Sum(i => i.ConsumedValue),
+                ReturnedValue = r.Stages.SelectMany(s => s.Inputs).Sum(i => i.ReturnedValue),
+                r.CreatedAt,
+                r.CompletedAt
+            })
+            .ToListAsync(ct);
+
+        var items = rows.Select(r =>
+        {
+            var good = r.Output.ProducedQty - r.Output.ScrappedQty;
+            // Same formula PostReceiptAsync uses to cost the finished layer at approve
+            // (FR-MFG-13): pool / good qty, 6dp. TotalCost carries the pool exactly rather
+            // than good * unitCost, which drifts from it past ~100 units (see the ledgerValue
+            // rounding note in PostReceiptAsync).
+            var pool = r.ConsumedValue - r.ReturnedValue;
+            var unitCost = good > 0 ? Math.Round(pool / good, 6, MidpointRounding.AwayFromZero) : 0m;
+            return new ProducedLineDto(
+                r.RunId, r.DocNo, r.Status, r.TemplateId, r.TemplateName,
+                r.WarehouseId, r.WarehouseName,
+                r.Output.ItemId!.Value, r.Output.ItemName,
+                r.Output.ProducedQty, r.Output.ScrappedQty, good,
+                unitCost, pool,
+                r.CreatedAt, r.CompletedAt);
+        }).ToList();
+
+        var summary = new ProducedSummaryDto(
+            items.Count,
+            items.Sum(i => i.ProducedQty),
+            items.Sum(i => i.ScrappedQty),
+            items.Sum(i => i.GoodQty),
+            items.Sum(i => i.TotalCost));
+
+        return new ProducedListResponseDto(items, summary);
+    }
+
     public async Task<ETagged<RunGraphDto>?> GetAsync(int runId, CancellationToken ct = default)
     {
         var run = await LoadGraphQuery().AsNoTracking().FirstOrDefaultAsync(r => r.RunId == runId, ct);

Backend/ERPCore/Services/PurchaseReturnService.cs

@@ -6,6 +6,7 @@ using ERPCore.Dtos.Procurement;
 using ERPCore.Infra.Auth;
 using ERPCore.Infra.UoW;
 using ERPCore.Repositories.Interfaces;
+using ERPCore.Services.Gl;
 using ERPCore.Services.Interfaces;
 using ERPCore.System.Errors;
 using Microsoft.EntityFrameworkCore;
@@ -16,7 +17,9 @@ namespace ERPCore.Services;
 /// Purchase-return service (FR-PROC-08). Auto-posts with a mandatory Return reason
 /// code and generates an outbound stock movement via the shared
 /// <see cref="IStockMutator"/> (FIFO consume, row-locked; over-return beyond
-/// available → STOCK_NEGATIVE_BLOCKED). Single UoW transaction.
+/// available → STOCK_NEGATIVE_BLOCKED). Single UoW transaction. Also posts a real GL
+/// journal entry reversing the Inventory/Clearing lines the original <see cref="Grn"/>
+/// posted — reuses <c>Grn</c>'s own account config since it's reversing that posting.
 /// </summary>
 public sealed class PurchaseReturnService : IPurchaseReturnService
 {
@@ -31,12 +34,15 @@ public sealed class PurchaseReturnService : IPurchaseReturnService
     private readonly INumberSequenceService _numbers;
     private readonly ICurrentUser _currentUser;
     private readonly IUnitOfWork _uow;
+    private readonly IGeneralLedgerService _gl;
+    private readonly string _glInventoryAccountCode;
+    private readonly string _glClearingAccountCode;
 
     public PurchaseReturnService(
         IRepository<PurchaseReturn> returns, IRepository<Vendor> vendors, IRepository<Warehouse> warehouses,
         IRepository<Item> items, IRepository<ReasonCode> reasonCodes, IRepository<GrnLine> grnLines,
         IRepository<StockLedger> ledger, IStockMutator mutator, INumberSequenceService numbers,
-        ICurrentUser currentUser, IUnitOfWork uow)
+        ICurrentUser currentUser, IUnitOfWork uow, IGeneralLedgerService gl, IConfiguration configuration)
     {
         _returns = returns;
         _vendors = vendors;
@@ -49,6 +55,9 @@ public sealed class PurchaseReturnService : IPurchaseReturnService
         _numbers = numbers;
         _currentUser = currentUser;
         _uow = uow;
+        _gl = gl;
+        _glInventoryAccountCode = configuration["Grn:GlInventoryAccountCode"] ?? string.Empty;
+        _glClearingAccountCode = configuration["Grn:GlClearingAccountCode"] ?? string.Empty;
     }
 
     public async Task<PagedResponse<PurchaseReturnSummaryDto>> ListAsync(
@@ -69,7 +78,7 @@ public sealed class PurchaseReturnService : IPurchaseReturnService
             .Skip(query.Skip).Take(query.PageSize)
             .Select(r => new PurchaseReturnSummaryDto(
                 r.ReturnId, r.DocNo, r.VendorId, r.WarehouseId, r.ReasonCodeId, r.Status,
-                r.CreatedBy, r.CreatedAt, r.Lines.Count))
+                r.CreatedBy, r.CreatedAt, r.Lines.Count, r.GlJournalNo))
             .ToListAsync(ct);
 
         return PagedResponse<PurchaseReturnSummaryDto>.Create(rows, query.Page, query.PageSize, total);
@@ -146,6 +155,28 @@ public sealed class PurchaseReturnService : IPurchaseReturnService
             await _uow.SaveChangesAsync(token); // flush for a valid ledger sourceDocId
 
             var refs = await _mutator.ApplyAsync(request.WarehouseId, DocumentTypes.PurchaseReturn, ret.ReturnId, now, deltas, token);
+
+            var totalValue = refs.Sum(r => r.Value);
+            if (totalValue > 0)
+            {
+                var period = await _gl.GetPeriodByDateAsync(DateOnly.FromDateTime(now), token);
+                var glResult = await _gl.PostJournalEntryAsync(new GlJournalEntryRequest
+                {
+                    PeriodId = period.PeriodId,
+                    EntryDate = DateOnly.FromDateTime(now),
+                    SourceModule = "PURCHASE-RETURN",
+                    Reference = docNo,
+                    Narration = $"Purchase return {docNo} — stock returned to vendor",
+                    Lines = new List<GlJournalEntryLineRequest>
+                    {
+                        new(_glClearingAccountCode, totalValue, 0m, $"Purchase return {docNo}"),
+                        new(_glInventoryAccountCode, 0m, totalValue, $"Purchase return {docNo} — inventory reduction")
+                    }
+                }, token);
+                ret.GlJournalNo = glResult.JournalNo;
+                ret.GlPostedAt = now;
+            }
+
             return (ret, refs);
         }, ct);
 
@@ -155,6 +186,7 @@ public sealed class PurchaseReturnService : IPurchaseReturnService
 
     private static PurchaseReturnDto ToDto(PurchaseReturn r, IReadOnlyList<int> ledgerRefs) => new(
         r.ReturnId, r.DocNo, r.VendorId, r.WarehouseId, r.ReasonCodeId, r.Status, r.CreatedBy, r.CreatedAt,
+        r.GlJournalNo, r.GlPostedAt,
         r.Lines.OrderBy(l => l.ReturnLineId)
             .Select(l => new PurchaseReturnLineDto(l.ReturnLineId, l.GrnLineId, l.ItemId, l.Qty)).ToList(),
         ledgerRefs);

Backend/ERPCore/Services/SalesDayEndService.cs

@@ -0,0 +1,319 @@
+using ERPCore.Domain;
+using ERPCore.Domain.Entities;
+using ERPCore.Domain.Enums;
+using ERPCore.Dtos.Common;
+using ERPCore.Dtos.Sales;
+using ERPCore.Infra.Auth;
+using ERPCore.Infra.UoW;
+using ERPCore.Repositories.Interfaces;
+using ERPCore.Services.Gl;
+using ERPCore.Services.Interfaces;
+using ERPCore.System.Errors;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+
+namespace ERPCore.Services;
+
+/// <summary>
+/// Cashier day-end close-out. A day's <see cref="SalesSlip"/>s and <see cref="BundleSale"/>s —
+/// both cashier documents with the same Draft→Posted lifecycle, just priced differently — are
+/// rung up individually through the day with no GL impact of their own; <see cref="CloseAsync"/>
+/// is the single point where that day's sales become real accounting entries — one consolidated
+/// journal entry per cashier per day, mirroring how <see cref="GrnService"/> posts per receipt.
+/// Every document is treated as a cash sale (Debit Cash for GrandTotal): SalesSlip's
+/// PaidAmount/BalanceAmount fields exist for a future partial-payment flow but nothing
+/// sets them today (SalesSlipService.CreateAsync always leaves PaidAmount at 0), so
+/// they aren't a usable signal here — see docs/14-BACKEND-SALES-API.md if that changes.
+/// A bundle sale's net revenue is always exactly <c>BundlePrice</c> (<c>GrandTotal - TaxTotal</c>
+/// by construction, docs/15) regardless of whether the bundle sold at a discount or a premium to
+/// its component subtotal, so it folds into Subtotal/DiscountTotal the same way a slip's net
+/// (Subtotal - DiscountTotal) does, without a separate "bundle discount" GL line.
+/// </summary>
+public sealed class SalesDayEndService : ISalesDayEndService
+{
+    private readonly IRepository<SalesDayEnd> _dayEnds;
+    private readonly IRepository<SalesSlip> _slips;
+    private readonly IRepository<BundleSale> _bundles;
+    private readonly IRepository<StockLedger> _ledger;
+    private readonly IRepository<Item> _items;
+    private readonly INumberSequenceService _numbers;
+    private readonly ICurrentUser _currentUser;
+    private readonly IUnitOfWork _uow;
+    private readonly IGeneralLedgerService _gl;
+    private readonly string _glCashAccountCode;
+    private readonly string _glSalesRevenueAccountCode;
+    private readonly string _glSalesDiscountAccountCode;
+    private readonly string _glTaxPayableAccountCode;
+    private readonly string _glCogsAccountCode;
+    private readonly string _glInventoryAccountCode;
+
+    public SalesDayEndService(
+        IRepository<SalesDayEnd> dayEnds, IRepository<SalesSlip> slips, IRepository<BundleSale> bundles,
+        IRepository<StockLedger> ledger, IRepository<Item> items, INumberSequenceService numbers,
+        ICurrentUser currentUser, IUnitOfWork uow, IGeneralLedgerService gl, IConfiguration configuration)
+    {
+        _dayEnds = dayEnds;
+        _slips = slips;
+        _bundles = bundles;
+        _ledger = ledger;
+        _items = items;
+        _numbers = numbers;
+        _currentUser = currentUser;
+        _uow = uow;
+        _gl = gl;
+        _glCashAccountCode = configuration["SalesDayEnd:GlCashAccountCode"] ?? string.Empty;
+        _glSalesRevenueAccountCode = configuration["SalesDayEnd:GlSalesRevenueAccountCode"] ?? string.Empty;
+        _glSalesDiscountAccountCode = configuration["SalesDayEnd:GlSalesDiscountAccountCode"] ?? string.Empty;
+        _glTaxPayableAccountCode = configuration["SalesDayEnd:GlTaxPayableAccountCode"] ?? string.Empty;
+        _glCogsAccountCode = configuration["SalesDayEnd:GlCogsAccountCode"] ?? string.Empty;
+        _glInventoryAccountCode = configuration["SalesDayEnd:GlInventoryAccountCode"] ?? string.Empty;
+    }
+
+    public async Task<SalesDayEndPreviewDto> PreviewAsync(int cashierUserId, DateOnly businessDate, CancellationToken ct = default)
+    {
+        var existing = await _dayEnds.Query().AsNoTracking()
+            .FirstOrDefaultAsync(x => x.CashierUserId == cashierUserId && x.BusinessDate == businessDate, ct);
+        if (existing is not null)
+        {
+            var closedSlipNumbers = await _slips.Query().AsNoTracking()
+                .Where(x => x.DayEndId == existing.SalesDayEndId)
+                .OrderBy(x => x.SlipNo)
+                .Select(x => x.SlipNo)
+                .ToListAsync(ct);
+            var closedBundleNumbers = await _bundles.Query().AsNoTracking()
+                .Where(x => x.DayEndId == existing.SalesDayEndId)
+                .OrderBy(x => x.BundleNo)
+                .Select(x => x.BundleNo)
+                .ToListAsync(ct);
+            return new SalesDayEndPreviewDto(
+                cashierUserId, businessDate, true,
+                existing.SlipCount, existing.BundleCount, existing.Subtotal, existing.DiscountTotal, existing.TaxTotal, existing.GrandTotal,
+                closedSlipNumbers, closedBundleNumbers,
+                Array.Empty<DraftSlipBlockingCloseDto>(), Array.Empty<DraftBundleBlockingCloseDto>());
+        }
+
+        var openSlips = await LoadOpenSlipsAsync(cashierUserId, businessDate, ct);
+        var postedSlips = openSlips.Where(x => x.Status == SalesSlipStatus.Posted).ToList();
+        var draftSlips = openSlips.Where(x => x.Status == SalesSlipStatus.Draft).ToList();
+
+        var openBundles = await LoadOpenBundleSalesAsync(cashierUserId, businessDate, ct);
+        var postedBundles = openBundles.Where(x => x.Status == BundleSaleStatus.Posted).ToList();
+        var draftBundles = openBundles.Where(x => x.Status == BundleSaleStatus.Draft).ToList();
+
+        var subtotal = postedSlips.Sum(x => x.Subtotal) + postedBundles.Sum(x => x.BundlePrice);
+        var discountTotal = postedSlips.Sum(x => x.DiscountTotal);
+        var taxTotal = postedSlips.Sum(x => x.TaxTotal) + postedBundles.Sum(x => x.TaxTotal);
+        var grandTotal = postedSlips.Sum(x => x.GrandTotal) + postedBundles.Sum(x => x.GrandTotal);
+
+        return new SalesDayEndPreviewDto(
+            cashierUserId, businessDate, false,
+            postedSlips.Count, postedBundles.Count, subtotal, discountTotal, taxTotal, grandTotal,
+            postedSlips.OrderBy(x => x.SlipNo).Select(x => x.SlipNo).ToList(),
+            postedBundles.OrderBy(x => x.BundleNo).Select(x => x.BundleNo).ToList(),
+            draftSlips.OrderBy(x => x.SlipNo).Select(x => new DraftSlipBlockingCloseDto(x.SalesSlipId, x.SlipNo, x.GrandTotal)).ToList(),
+            draftBundles.OrderBy(x => x.BundleNo).Select(x => new DraftBundleBlockingCloseDto(x.BundleSaleId, x.BundleNo, x.GrandTotal)).ToList());
+    }
+
+    public async Task<SalesDayEndDto> CloseAsync(CreateSalesDayEndRequest request, CancellationToken ct = default)
+    {
+        var businessDate = request.BusinessDate ?? DateOnly.FromDateTime(DateTime.UtcNow);
+
+        // Idempotent replay (same pattern as GrnService.ConfirmAsync): closing an
+        // already-closed date returns the existing record instead of erroring.
+        var existing = await _dayEnds.Query()
+            .FirstOrDefaultAsync(x => x.CashierUserId == request.CashierUserId && x.BusinessDate == businessDate, ct);
+        if (existing is not null)
+            return await BuildDtoAsync(existing, ct);
+
+        var openSlips = await LoadOpenSlipsAsync(request.CashierUserId, businessDate, ct);
+        var draftSlips = openSlips.Where(x => x.Status == SalesSlipStatus.Draft).ToList();
+        var openBundles = await LoadOpenBundleSalesAsync(request.CashierUserId, businessDate, ct);
+        var draftBundles = openBundles.Where(x => x.Status == BundleSaleStatus.Draft).ToList();
+
+        if (draftSlips.Count > 0 || draftBundles.Count > 0)
+        {
+            var parts = new List<string>();
+            if (draftSlips.Count > 0)
+                parts.Add($"{draftSlips.Count} sales slip(s): " + string.Join(", ", draftSlips.OrderBy(x => x.SlipNo).Select(x => x.SlipNo)));
+            if (draftBundles.Count > 0)
+                parts.Add($"{draftBundles.Count} bundle sale(s): " + string.Join(", ", draftBundles.OrderBy(x => x.BundleNo).Select(x => x.BundleNo)));
+            throw new ConflictException(
+                "Still Draft for this cashier/date — post or cancel them before closing the day: " + string.Join("; ", parts));
+        }
+
+        var postedSlips = openSlips.Where(x => x.Status == SalesSlipStatus.Posted).ToList();
+        var settledSlips = openSlips.Where(x => x.Status != SalesSlipStatus.Draft).ToList(); // Posted + Cancelled — everything gets frozen against this close
+        var postedBundles = openBundles.Where(x => x.Status == BundleSaleStatus.Posted).ToList();
+        var settledBundles = openBundles.Where(x => x.Status != BundleSaleStatus.Draft).ToList();
+
+        var subtotal = postedSlips.Sum(x => x.Subtotal) + postedBundles.Sum(x => x.BundlePrice);
+        var discountTotal = postedSlips.Sum(x => x.DiscountTotal);
+        var taxTotal = postedSlips.Sum(x => x.TaxTotal) + postedBundles.Sum(x => x.TaxTotal);
+        var grandTotal = postedSlips.Sum(x => x.GrandTotal) + postedBundles.Sum(x => x.GrandTotal);
+
+        var slipIds = postedSlips.Select(x => x.SalesSlipId).ToList();
+        var bundleIds = postedBundles.Select(x => x.BundleSaleId).ToList();
+        var slipCogs = slipIds.Count == 0
+            ? 0m
+            : await _ledger.Query().AsNoTracking()
+                .Where(l => l.SourceDocType == DocumentTypes.SalesSlip && slipIds.Contains(l.SourceDocId) && l.Direction == Direction.Out)
+                .SumAsync(l => l.Value, ct);
+        var bundleCogs = bundleIds.Count == 0
+            ? 0m
+            : await _ledger.Query().AsNoTracking()
+                .Where(l => l.SourceDocType == DocumentTypes.BundleSale && bundleIds.Contains(l.SourceDocId) && l.Direction == Direction.Out)
+                .SumAsync(l => l.Value, ct);
+        var cogs = slipCogs + bundleCogs;
+
+        var dayEnd = await _uow.ExecuteInTransactionAsync(async token =>
+        {
+            var now = DateTime.UtcNow;
+            var docNo = await _numbers.NextAsync(DocumentTypes.SalesDayEnd, token);
+            var entity = new SalesDayEnd
+            {
+                DocNo = docNo,
+                CashierUserId = request.CashierUserId,
+                BusinessDate = businessDate,
+                SlipCount = postedSlips.Count,
+                BundleCount = postedBundles.Count,
+                Subtotal = subtotal,
+                DiscountTotal = discountTotal,
+                TaxTotal = taxTotal,
+                GrandTotal = grandTotal,
+                CostOfGoodsSold = cogs,
+                ClosedBy = _currentUser.AuditUserId,
+                ClosedAt = now
+            };
+
+            if (grandTotal > 0 || cogs > 0)
+            {
+                var period = await _gl.GetPeriodByDateAsync(businessDate, token);
+                var glLines = new List<GlJournalEntryLineRequest>();
+                if (grandTotal > 0)
+                {
+                    glLines.Add(new GlJournalEntryLineRequest(_glCashAccountCode, grandTotal, 0m, $"Day-end {businessDate:yyyy-MM-dd} cashier {request.CashierUserId} — cash collected"));
+                    if (discountTotal > 0)
+                        glLines.Add(new GlJournalEntryLineRequest(_glSalesDiscountAccountCode, discountTotal, 0m, "Sales discount"));
+                    glLines.Add(new GlJournalEntryLineRequest(_glSalesRevenueAccountCode, 0m, subtotal, "Sales revenue"));
+                    if (taxTotal > 0)
+                        glLines.Add(new GlJournalEntryLineRequest(_glTaxPayableAccountCode, 0m, taxTotal, "Output tax payable"));
+                }
+                if (cogs > 0)
+                {
+                    glLines.Add(new GlJournalEntryLineRequest(_glCogsAccountCode, cogs, 0m, "Cost of goods sold"));
+                    glLines.Add(new GlJournalEntryLineRequest(_glInventoryAccountCode, 0m, cogs, "Inventory reduction"));
+                }
+
+                var glResult = await _gl.PostJournalEntryAsync(new GlJournalEntryRequest
+                {
+                    PeriodId = period.PeriodId,
+                    EntryDate = businessDate,
+                    SourceModule = "SALES-DAYEND",
+                    Reference = docNo,
+                    Narration = $"Cashier day-end {docNo} — {businessDate:yyyy-MM-dd}",
+                    Lines = glLines
+                }, token);
+                entity.GlJournalNo = glResult.JournalNo;
+                entity.GlPostedAt = now;
+            }
+
+            // Relationship fixup, not a direct FK assignment: `entity` has no real id yet
+            // (assigned by SaveChangesAsync inside ExecuteInTransactionAsync) — EF resolves
+            // the FK on these already-tracked rows from the navigation once it does, so the
+            // day-end row and every slip's/bundle's DayEndId commit together in one transaction.
+            foreach (var slip in settledSlips) slip.DayEnd = entity;
+            foreach (var bundle in settledBundles) bundle.DayEnd = entity;
+
+            await _dayEnds.AddAsync(entity, token);
+            return entity;
+        }, ct);
+
+        return await BuildDtoAsync(dayEnd, ct);
+    }
+
+    public async Task<PagedResponse<SalesDayEndSummaryDto>> ListAsync(PageQuery query, int? cashierUserId, CancellationToken ct = default)
+    {
+        var q = _dayEnds.Query().AsNoTracking();
+        if (cashierUserId is not null) q = q.Where(x => x.CashierUserId == cashierUserId);
+
+        var total = await q.CountAsync(ct);
+        var rows = await q.OrderByDescending(x => x.SalesDayEndId).Skip(query.Skip).Take(query.PageSize).ToListAsync(ct);
+        var items = rows.Select(x => new SalesDayEndSummaryDto(
+            x.SalesDayEndId, x.DocNo, x.CashierUserId, x.BusinessDate, x.SlipCount, x.BundleCount, x.GrandTotal, x.GlJournalNo, x.ClosedAt)).ToList();
+        return PagedResponse<SalesDayEndSummaryDto>.Create(items, query.Page, query.PageSize, total);
+    }
+
+    public async Task<SalesDayEndDto?> GetAsync(int salesDayEndId, CancellationToken ct = default)
+    {
+        var entity = await _dayEnds.Query().AsNoTracking().FirstOrDefaultAsync(x => x.SalesDayEndId == salesDayEndId, ct);
+        return entity is null ? null : await BuildDtoAsync(entity, ct);
+    }
+
+    private async Task<List<SalesSlip>> LoadOpenSlipsAsync(int cashierUserId, DateOnly businessDate, CancellationToken ct)
+    {
+        var (dayStart, dayEnd) = DayRangeUtc(businessDate);
+        return await _slips.Query()
+            .Where(x => x.CashierUserId == cashierUserId && x.DayEndId == null && x.SlipDate >= dayStart && x.SlipDate < dayEnd)
+            .ToListAsync(ct);
+    }
+
+    private async Task<List<BundleSale>> LoadOpenBundleSalesAsync(int cashierUserId, DateOnly businessDate, CancellationToken ct)
+    {
+        var (dayStart, dayEnd) = DayRangeUtc(businessDate);
+        return await _bundles.Query()
+            .Where(x => x.CashierUserId == cashierUserId && x.DayEndId == null && x.BundleDate >= dayStart && x.BundleDate < dayEnd)
+            .ToListAsync(ct);
+    }
+
+    // SlipDate/BundleDate are stored as DateTime.UtcNow (Kind=Utc) throughout — Npgsql requires
+    // a matching Kind=Utc here too, or comparisons against the `timestamptz` column throw.
+    private static (DateTime Start, DateTime End) DayRangeUtc(DateOnly businessDate)
+    {
+        var start = DateTime.SpecifyKind(businessDate.ToDateTime(TimeOnly.MinValue), DateTimeKind.Utc);
+        return (start, start.AddDays(1));
+    }
+
+    private async Task<SalesDayEndDto> BuildDtoAsync(SalesDayEnd entity, CancellationToken ct)
+    {
+        var postedSlips = await _slips.Query().AsNoTracking().Include(x => x.Lines)
+            .Where(x => x.DayEndId == entity.SalesDayEndId && x.Status == SalesSlipStatus.Posted)
+            .ToListAsync(ct);
+        var postedBundles = await _bundles.Query().AsNoTracking().Include(x => x.Lines)
+            .Where(x => x.DayEndId == entity.SalesDayEndId && x.Status == BundleSaleStatus.Posted)
+            .ToListAsync(ct);
+
+        var slipNumbers = postedSlips.OrderBy(x => x.SlipNo).Select(x => x.SlipNo).ToList();
+        var bundleNumbers = postedBundles.OrderBy(x => x.BundleNo).Select(x => x.BundleNo).ToList();
+
+        var slipQtyRevenue = postedSlips.SelectMany(x => x.Lines)
+            .GroupBy(l => l.ItemId)
+            .Select(g => new { ItemId = g.Key, Qty = g.Sum(l => l.Qty + l.FreeQty), Revenue = g.Sum(l => l.LineTotal) });
+        var bundleQtyRevenue = postedBundles.SelectMany(x => x.Lines)
+            .GroupBy(l => l.ItemId)
+            .Select(g => new { ItemId = g.Key, Qty = g.Sum(l => l.Qty), Revenue = g.Sum(l => l.LineTotal) });
+
+        var grouped = slipQtyRevenue.Concat(bundleQtyRevenue)
+            .GroupBy(x => x.ItemId)
+            .Select(g => new { ItemId = g.Key, Qty = g.Sum(x => x.Qty), Revenue = g.Sum(x => x.Revenue) })
+            .ToList();
+        var itemIds = grouped.Select(g => g.ItemId).ToList();
+        var itemInfo = await _items.Query().AsNoTracking()
+            .Where(i => itemIds.Contains(i.ItemId))
+            .Select(i => new { i.ItemId, i.Sku, i.Name })
+            .ToListAsync(ct);
+        var breakdown = grouped
+            .Select(g =>
+            {
+                var info = itemInfo.FirstOrDefault(i => i.ItemId == g.ItemId);
+                return new SalesDayEndItemLineDto(g.ItemId, info?.Sku ?? $"SKU-{g.ItemId}", info?.Name ?? "—", g.Qty, g.Revenue);
+            })
+            .OrderByDescending(x => x.Revenue)
+            .ToList();
+
+        return new SalesDayEndDto(
+            entity.SalesDayEndId, entity.DocNo, entity.CashierUserId, entity.BusinessDate,
+            entity.SlipCount, entity.BundleCount, entity.Subtotal, entity.DiscountTotal, entity.TaxTotal, entity.GrandTotal,
+            entity.CostOfGoodsSold, entity.GlJournalNo, entity.GlPostedAt, entity.ClosedBy, entity.ClosedAt,
+            slipNumbers, bundleNumbers, breakdown);
+    }
+}

Backend/ERPCore/Services/SalesInvoicePaymentService.cs

@@ -0,0 +1,122 @@
+using ERPCore.Domain.Entities;
+using ERPCore.Domain.Enums;
+using ERPCore.Dtos.Sales;
+using ERPCore.Infra.Auth;
+using ERPCore.Infra.UoW;
+using ERPCore.Repositories.Interfaces;
+using ERPCore.Services.Gl;
+using ERPCore.Services.Interfaces;
+using ERPCore.System.Errors;
+using Microsoft.EntityFrameworkCore;
+
+namespace ERPCore.Services;
+
+/// <summary>
+/// Customer payments against a Posted sales invoice. Multiple installments are allowed
+/// until <see cref="SalesInvoice.BalanceAmount"/> reaches zero. Each payment posts its
+/// own real GL journal entry (Debit the selected bank-or-cash account / Credit Accounts
+/// Receivable) before being recorded, using the same call-GL-before-commit pattern as
+/// <see cref="GrnPaymentService"/> — the mirror image of it (that one credits a payable
+/// clearing account when vendor-paid; this one credits the receivable asset when
+/// customer-paid) — so a rejected/unreachable GL post rolls back the whole payment atomically.
+/// </summary>
+public sealed class SalesInvoicePaymentService : ISalesInvoicePaymentService
+{
+    private readonly IRepository<SalesInvoice> _invoices;
+    private readonly IRepository<SalesInvoicePayment> _payments;
+    private readonly IGeneralLedgerService _gl;
+    private readonly ICurrentUser _currentUser;
+    private readonly IUnitOfWork _uow;
+    private readonly string _glAccountsReceivableCode;
+
+    public SalesInvoicePaymentService(
+        IRepository<SalesInvoice> invoices, IRepository<SalesInvoicePayment> payments, IGeneralLedgerService gl,
+        ICurrentUser currentUser, IUnitOfWork uow, IConfiguration configuration)
+    {
+        _invoices = invoices;
+        _payments = payments;
+        _gl = gl;
+        _currentUser = currentUser;
+        _uow = uow;
+        _glAccountsReceivableCode = configuration["SalesInvoice:GlAccountsReceivableCode"] ?? string.Empty;
+    }
+
+    public async Task<SalesInvoicePaymentDto> PayAsync(int salesInvoiceId, CreateSalesInvoicePaymentRequest request, CancellationToken ct = default)
+    {
+        var invoice = await _invoices.Query().FirstOrDefaultAsync(i => i.SalesInvoiceId == salesInvoiceId, ct)
+            ?? throw new NotFoundException($"Sales invoice {salesInvoiceId} was not found.");
+
+        if (invoice.Status != SalesInvoiceStatus.Posted)
+            throw new DomainException(ErrorCodes.SalesInvoiceNotPayable, $"Sales invoice {salesInvoiceId} must be posted before it can be paid.", 409);
+        if (request.Amount > invoice.BalanceAmount)
+            throw new DomainException(ErrorCodes.SalesInvoicePaymentExceedsBalance,
+                $"Payment amount {request.Amount} exceeds the remaining balance {invoice.BalanceAmount}.", 400);
+
+        var accounts = await _gl.ListBankAccountsAsync(ct);
+        var account = accounts.FirstOrDefault(a => a.AccountId == request.GlBankAccountId)
+            ?? throw new DomainException(ErrorCodes.SalesInvoiceBankAccountNotFound, $"Bank/cash account {request.GlBankAccountId} was not found.", 404);
+
+        var actor = _currentUser.AuditUserId;
+        var now = DateTime.UtcNow;
+
+        var payment = await _uow.ExecuteInTransactionAsync(async token =>
+        {
+            // Same atomicity approach as GrnPaymentService.PayAsync: post to GL first, inside
+            // this transaction, before anything is committed — a GL rejection/timeout rolls
+            // the whole payment back with no partial local state.
+            var period = await _gl.GetPeriodByDateAsync(DateOnly.FromDateTime(now), token);
+            var posted = await _gl.PostJournalEntryAsync(new GlJournalEntryRequest
+            {
+                PeriodId = period.PeriodId,
+                EntryDate = DateOnly.FromDateTime(now),
+                SourceModule = "SALES_INVOICE_PAYMENT",
+                Reference = invoice.InvoiceNo,
+                Narration = $"Payment against invoice {invoice.InvoiceNo}",
+                Lines =
+                [
+                    new GlJournalEntryLineRequest(account.GlAccountCode, request.Amount, 0m, $"Payment against invoice {invoice.InvoiceNo}"),
+                    new GlJournalEntryLineRequest(_glAccountsReceivableCode, 0m, request.Amount, $"Payment against invoice {invoice.InvoiceNo}")
+                ]
+            }, token);
+
+            var entity = new SalesInvoicePayment
+            {
+                SalesInvoiceId = invoice.SalesInvoiceId,
+                Amount = request.Amount,
+                PaymentDate = now,
+                GlBankAccountId = account.AccountId,
+                BankAccountName = account.AccountName,
+                Reference = request.Reference,
+                GlJournalNo = posted.JournalNo,
+                CreatedBy = actor,
+                CreatedAt = now
+            };
+            await _payments.AddAsync(entity, token);
+
+            invoice.PaidAmount += request.Amount;
+            invoice.BalanceAmount -= request.Amount;
+
+            return entity;
+        }, ct);
+
+        return Map(payment);
+    }
+
+    public async Task<IReadOnlyList<SalesInvoicePaymentDto>> ListAsync(int salesInvoiceId, CancellationToken ct = default)
+    {
+        if (!await _invoices.Query().AnyAsync(i => i.SalesInvoiceId == salesInvoiceId, ct))
+            throw new NotFoundException($"Sales invoice {salesInvoiceId} was not found.");
+
+        return await _payments.Query().AsNoTracking()
+            .Where(p => p.SalesInvoiceId == salesInvoiceId)
+            .OrderByDescending(p => p.SalesInvoicePaymentId)
+            .Select(p => new SalesInvoicePaymentDto(
+                p.SalesInvoicePaymentId, p.SalesInvoiceId, p.Amount, p.PaymentDate,
+                p.GlBankAccountId, p.BankAccountName, p.Reference, p.GlJournalNo, p.CreatedAt))
+            .ToListAsync(ct);
+    }
+
+    private static SalesInvoicePaymentDto Map(SalesInvoicePayment p) => new(
+        p.SalesInvoicePaymentId, p.SalesInvoiceId, p.Amount, p.PaymentDate,
+        p.GlBankAccountId, p.BankAccountName, p.Reference, p.GlJournalNo, p.CreatedAt);
+}

Backend/ERPCore/Services/SalesInvoiceService.cs

@@ -80,24 +80,32 @@ public sealed class SalesInvoiceService : ISalesInvoiceService
     public async Task<ETagged<SalesInvoiceDto>> CreateAsync(CreateSalesInvoiceRequest request, CancellationToken ct = default)
     {
         await _sales.ValidateSalesHeaderAsync(request.CustomerId, request.WarehouseId, null, false, ct);
-        var invoice = new SalesInvoice
-        {
-            InvoiceNo = await _numbers.NextAsync(DocumentTypes.SalesInvoice, ct),
-            InvoiceDate = DateTime.UtcNow,
-            CustomerId = request.CustomerId,
-            WarehouseId = request.WarehouseId,
-            InvoiceType = request.InvoiceType,
-            Status = SalesInvoiceStatus.Draft,
-            CreatedBy = _currentUser.AuditUserId,
-            CreatedAt = DateTime.UtcNow
-        };
-        invoice.CustomerSnapshotName = await _customers.Query().Where(x => x.CustomerId == request.CustomerId).Select(x => x.DisplayName ?? x.Name).FirstAsync(ct);
-        invoice.CustomerSnapshotTaxNo = await _customers.Query().Where(x => x.CustomerId == request.CustomerId).Select(x => x.TaxRegistrationNo).FirstAsync(ct);
-        invoice.Lines = await BuildLinesAsync(request.WarehouseId, request.Lines, ct);
-        Recalculate(invoice);
 
-        await _invoices.AddAsync(invoice, ct);
-        await _uow.SaveChangesAsync(ct);
+        var customerSnapshotName = await _customers.Query().Where(x => x.CustomerId == request.CustomerId).Select(x => x.DisplayName ?? x.Name).FirstAsync(ct);
+        var customerSnapshotTaxNo = await _customers.Query().Where(x => x.CustomerId == request.CustomerId).Select(x => x.TaxRegistrationNo).FirstAsync(ct);
+        var lines = await BuildLinesAsync(request.WarehouseId, request.Lines, ct);
+
+        var invoice = await _uow.ExecuteInTransactionAsync(async token =>
+        {
+            var entity = new SalesInvoice
+            {
+                InvoiceNo = await _numbers.NextAsync(DocumentTypes.SalesInvoice, token),
+                InvoiceDate = DateTime.UtcNow,
+                CustomerId = request.CustomerId,
+                WarehouseId = request.WarehouseId,
+                InvoiceType = request.InvoiceType,
+                Status = SalesInvoiceStatus.Draft,
+                CreatedBy = _currentUser.AuditUserId,
+                CreatedAt = DateTime.UtcNow,
+                CustomerSnapshotName = customerSnapshotName,
+                CustomerSnapshotTaxNo = customerSnapshotTaxNo,
+                Lines = lines
+            };
+            Recalculate(entity);
+            await _invoices.AddAsync(entity, token);
+            return entity;
+        }, ct);
+
         return new ETagged<SalesInvoiceDto>(_mapping.MapInvoice(invoice), invoice.RowVersion);
     }
 
@@ -190,5 +198,5 @@ public sealed class SalesInvoiceService : ISalesInvoiceService
 
     private SalesInvoiceSummaryDto MapSummary(SalesInvoice x) => new(
         x.SalesInvoiceId, x.InvoiceNo, x.InvoiceDate, x.CustomerId, x.CustomerSnapshotName,
-        x.WarehouseId, x.InvoiceType, x.Status, _mapping.MapInvoiceTotals(x), x.CreatedAt);
+        x.WarehouseId, x.InvoiceType, x.Status, _mapping.MapInvoiceTotals(x), x.CreatedAt, x.GlJournalNo);
 }

Backend/ERPCore/Services/SalesMappingService.cs

@@ -33,6 +33,7 @@ public sealed class SalesMappingService : ISalesMappingService
             invoice.SalesInvoiceId, invoice.InvoiceNo, invoice.InvoiceDate, invoice.CustomerId,
             invoice.CustomerSnapshotName, invoice.CustomerSnapshotTaxNo, invoice.WarehouseId,
             invoice.InvoiceType, invoice.Status, invoice.CreatedBy, invoice.CreatedAt, invoice.UpdatedAt,
+            invoice.GlJournalNo, invoice.GlPostedAt,
             MapInvoiceTotals(invoice),
             invoice.Lines.Select(l => new SalesInvoiceLineDto(
                 l.SalesInvoiceLineId, l.ItemId, l.Description, l.Qty, l.FreeQty, l.WarehouseId,

Backend/ERPCore/Services/SalesPostingService.cs

@@ -5,6 +5,7 @@ using ERPCore.Dtos.Sales;
 using ERPCore.Infra.Auth;
 using ERPCore.Infra.UoW;
 using ERPCore.Repositories.Interfaces;
+using ERPCore.Services.Gl;
 using ERPCore.Services.Interfaces;
 using ERPCore.Services.Stock;
 using ERPCore.System.Errors;
@@ -22,6 +23,13 @@ public sealed class SalesPostingService : ISalesPostingService
     private readonly ISalesDomainService _sales;
     private readonly ICurrentUser _currentUser;
     private readonly IUnitOfWork _uow;
+    private readonly IGeneralLedgerService _gl;
+    private readonly string _glAccountsReceivableCode;
+    private readonly string _glSalesRevenueAccountCode;
+    private readonly string _glSalesDiscountAccountCode;
+    private readonly string _glTaxPayableAccountCode;
+    private readonly string _glCogsAccountCode;
+    private readonly string _glInventoryAccountCode;
 
     public SalesPostingService(
         IRepository<SalesInvoice> invoices,
@@ -31,7 +39,9 @@ public sealed class SalesPostingService : ISalesPostingService
         IFifoCostingService fifo,
         ISalesDomainService sales,
         ICurrentUser currentUser,
-        IUnitOfWork uow)
+        IUnitOfWork uow,
+        IGeneralLedgerService gl,
+        IConfiguration configuration)
     {
         _invoices = invoices;
         _slips = slips;
@@ -41,6 +51,15 @@ public sealed class SalesPostingService : ISalesPostingService
         _sales = sales;
         _currentUser = currentUser;
         _uow = uow;
+        _gl = gl;
+        _glAccountsReceivableCode = configuration["SalesInvoice:GlAccountsReceivableCode"] ?? string.Empty;
+        // Same physical accounts Sales Day End credits for slip/bundle revenue — an invoice
+        // just recognizes them immediately on Post instead of waiting for the day's close.
+        _glSalesRevenueAccountCode = configuration["SalesDayEnd:GlSalesRevenueAccountCode"] ?? string.Empty;
+        _glSalesDiscountAccountCode = configuration["SalesDayEnd:GlSalesDiscountAccountCode"] ?? string.Empty;
+        _glTaxPayableAccountCode = configuration["SalesDayEnd:GlTaxPayableAccountCode"] ?? string.Empty;
+        _glCogsAccountCode = configuration["SalesDayEnd:GlCogsAccountCode"] ?? string.Empty;
+        _glInventoryAccountCode = configuration["SalesDayEnd:GlInventoryAccountCode"] ?? string.Empty;
     }
 
     public async Task<SalesInvoicePostingCheckDto> CheckInvoiceAsync(int salesInvoiceId, CancellationToken ct = default)
@@ -143,7 +162,51 @@ public sealed class SalesPostingService : ISalesPostingService
             setUpdated: x => x.UpdatedAt = DateTime.UtcNow,
             sourceDocType: DocumentTypes.SalesInvoice,
             getDocId: x => x.SalesInvoiceId,
-            ct: ct);
+            ct: ct,
+            afterConsumption: PostInvoiceRevenueAsync);
+
+    /// <summary>
+    /// Revenue recognition for an invoice, run inside the same transaction as its stock
+    /// consumption (so a GL rejection rolls back the posting too, not just leaves it
+    /// half-done): Debit Accounts Receivable for the full NetPayable, Credit Sales Revenue
+    /// (net of discount) and Output Tax, and Debit COGS / Credit Inventory for whatever the
+    /// consumption loop above just cost. Unlike SalesSlip/BundleSale, an invoice is not a
+    /// cashier document and never goes through Sales Day End, so this is its only GL entry.
+    /// </summary>
+    private async Task PostInvoiceRevenueAsync(SalesInvoice invoice, decimal cogs, CancellationToken ct)
+    {
+        if (invoice.NetPayable <= 0 && cogs <= 0) return;
+
+        var now = DateTime.UtcNow;
+        var period = await _gl.GetPeriodByDateAsync(DateOnly.FromDateTime(now), ct);
+        var lines = new List<GlJournalEntryLineRequest>();
+        if (invoice.NetPayable > 0)
+        {
+            lines.Add(new GlJournalEntryLineRequest(_glAccountsReceivableCode, invoice.NetPayable, 0m, $"Invoice {invoice.InvoiceNo}"));
+            if (invoice.DiscountTotal > 0)
+                lines.Add(new GlJournalEntryLineRequest(_glSalesDiscountAccountCode, invoice.DiscountTotal, 0m, "Sales discount"));
+            lines.Add(new GlJournalEntryLineRequest(_glSalesRevenueAccountCode, 0m, invoice.Subtotal, "Sales revenue"));
+            if (invoice.TaxTotal > 0)
+                lines.Add(new GlJournalEntryLineRequest(_glTaxPayableAccountCode, 0m, invoice.TaxTotal, "Output tax payable"));
+        }
+        if (cogs > 0)
+        {
+            lines.Add(new GlJournalEntryLineRequest(_glCogsAccountCode, cogs, 0m, "Cost of goods sold"));
+            lines.Add(new GlJournalEntryLineRequest(_glInventoryAccountCode, 0m, cogs, "Inventory reduction"));
+        }
+
+        var result = await _gl.PostJournalEntryAsync(new GlJournalEntryRequest
+        {
+            PeriodId = period.PeriodId,
+            EntryDate = DateOnly.FromDateTime(now),
+            SourceModule = "SALES_INVOICE",
+            Reference = invoice.InvoiceNo,
+            Narration = $"Sales invoice {invoice.InvoiceNo} posted",
+            Lines = lines
+        }, ct);
+        invoice.GlJournalNo = result.JournalNo;
+        invoice.GlPostedAt = now;
+    }
 
     public Task PostSlipAsync(int salesSlipId, CancellationToken ct = default)
         => PostAsync(
@@ -181,7 +244,11 @@ public sealed class SalesPostingService : ISalesPostingService
         Action<T> setUpdated,
         string sourceDocType,
         Func<T, int> getDocId,
-        CancellationToken ct)
+        CancellationToken ct,
+        /// <summary>Run inside the same transaction, after consumption and status flip, with the
+        /// total COGS this call just consumed — the invoice-only revenue-recognition hook.
+        /// Null for slip/bundle posting, which stays GL-silent here (Sales Day End handles them).</summary>
+        Func<T, decimal, CancellationToken, Task>? afterConsumption = null)
         where T : class
     {
         var doc = await load() ?? throw new NotFoundException(notFoundMessage);
@@ -192,6 +259,7 @@ public sealed class SalesPostingService : ISalesPostingService
 
         await _uow.ExecuteInTransactionAsync(async token =>
         {
+            var totalCogs = 0m;
             foreach (var line in getLines(doc))
             {
                 if (line.Qty <= 0) continue;
@@ -202,12 +270,15 @@ public sealed class SalesPostingService : ISalesPostingService
                 // carry no unit of their own — so this is the quantity FIFO consumes verbatim.
                 var consumed = await _fifo.ConsumeAsync(line.ItemId, line.WarehouseId, null, line.Qty, token);
                 var cost = consumed.Count == 0 ? 0m : consumed.Sum(x => x.Qty * x.UnitCost) / consumed.Sum(x => x.Qty);
+                totalCogs += cost * line.Qty;
                 await _fifo.PostLedgerAsync(line.ItemId, line.WarehouseId, null, null, null, _currentUser.AuditUserId,
                     Direction.Out, line.Qty, cost, 0m, sourceDocType, getDocId(doc), DateTime.UtcNow, token);
             }
 
             setPosted(doc);
             setUpdated(doc);
+
+            if (afterConsumption is not null) await afterConsumption(doc, totalCogs, token);
         }, ct);
     }
 

Backend/ERPCore/Services/SalesReturnService.cs

@@ -6,6 +6,7 @@ using ERPCore.Dtos.Sales;
 using ERPCore.Infra.Auth;
 using ERPCore.Infra.UoW;
 using ERPCore.Repositories.Interfaces;
+using ERPCore.Services.Gl;
 using ERPCore.Services.Interfaces;
 using ERPCore.System.Errors;
 using Microsoft.EntityFrameworkCore;
@@ -17,7 +18,10 @@ namespace ERPCore.Services;
 /// generates an inbound stock movement via the shared <see cref="IStockMutator"/>
 /// (positive delta — creates an inbound FIFO layer at last cost). Single UoW
 /// transaction, mirroring <see cref="PurchaseReturnService"/> with the direction
-/// reversed.
+/// reversed. Also posts a real GL journal entry reversing Inventory/COGS for the
+/// stock movement's value (see <see cref="SalesReturn.GlJournalNo"/> for why revenue/tax
+/// aren't part of it) — reuses the Sales Day End accounts since that's the module
+/// whose COGS this reverses.
 /// </summary>
 public sealed class SalesReturnService : ISalesReturnService
 {
@@ -33,12 +37,16 @@ public sealed class SalesReturnService : ISalesReturnService
     private readonly INumberSequenceService _numbers;
     private readonly ICurrentUser _currentUser;
     private readonly IUnitOfWork _uow;
+    private readonly IGeneralLedgerService _gl;
+    private readonly string _glInventoryAccountCode;
+    private readonly string _glCogsAccountCode;
 
     public SalesReturnService(
         IRepository<SalesReturn> returns, IRepository<Customer> customers, IRepository<Warehouse> warehouses,
         IRepository<Item> items, IRepository<ReasonCode> reasonCodes, IRepository<SalesInvoiceLine> salesInvoiceLines,
         IRepository<SalesReturnLine> returnLines, IRepository<StockLedger> ledger, IStockMutator mutator,
-        INumberSequenceService numbers, ICurrentUser currentUser, IUnitOfWork uow)
+        INumberSequenceService numbers, ICurrentUser currentUser, IUnitOfWork uow,
+        IGeneralLedgerService gl, IConfiguration configuration)
     {
         _returns = returns;
         _customers = customers;
@@ -52,6 +60,9 @@ public sealed class SalesReturnService : ISalesReturnService
         _numbers = numbers;
         _currentUser = currentUser;
         _uow = uow;
+        _gl = gl;
+        _glInventoryAccountCode = configuration["SalesDayEnd:GlInventoryAccountCode"] ?? string.Empty;
+        _glCogsAccountCode = configuration["SalesDayEnd:GlCogsAccountCode"] ?? string.Empty;
     }
 
     public async Task<PagedResponse<SalesReturnSummaryDto>> ListAsync(
@@ -72,7 +83,7 @@ public sealed class SalesReturnService : ISalesReturnService
             .Skip(query.Skip).Take(query.PageSize)
             .Select(r => new SalesReturnSummaryDto(
                 r.ReturnId, r.DocNo, r.CustomerId, r.WarehouseId, r.ReasonCodeId, r.Status,
-                r.CreatedBy, r.CreatedAt, r.Lines.Count, r.Lines.Sum(l => l.Qty)))
+                r.CreatedBy, r.CreatedAt, r.Lines.Count, r.Lines.Sum(l => l.Qty), r.GlJournalNo))
             .ToListAsync(ct);
 
         return PagedResponse<SalesReturnSummaryDto>.Create(rows, query.Page, query.PageSize, total);
@@ -164,6 +175,28 @@ public sealed class SalesReturnService : ISalesReturnService
             await _uow.SaveChangesAsync(token); // flush for a valid ledger sourceDocId
 
             var refs = await _mutator.ApplyAsync(request.WarehouseId, DocumentTypes.SalesReturn, ret.ReturnId, now, deltas, token);
+
+            var totalValue = refs.Sum(r => r.Value);
+            if (totalValue > 0)
+            {
+                var period = await _gl.GetPeriodByDateAsync(DateOnly.FromDateTime(now), token);
+                var glResult = await _gl.PostJournalEntryAsync(new GlJournalEntryRequest
+                {
+                    PeriodId = period.PeriodId,
+                    EntryDate = DateOnly.FromDateTime(now),
+                    SourceModule = "SALES-RETURN",
+                    Reference = docNo,
+                    Narration = $"Sales return {docNo} — stock restocked",
+                    Lines = new List<GlJournalEntryLineRequest>
+                    {
+                        new(_glInventoryAccountCode, totalValue, 0m, $"Sales return {docNo}"),
+                        new(_glCogsAccountCode, 0m, totalValue, $"Sales return {docNo} — COGS reversal")
+                    }
+                }, token);
+                ret.GlJournalNo = glResult.JournalNo;
+                ret.GlPostedAt = now;
+            }
+
             return (ret, refs);
         }, ct);
 
@@ -194,6 +227,7 @@ public sealed class SalesReturnService : ISalesReturnService
 
     private static SalesReturnDto ToDto(SalesReturn r, IReadOnlyList<int> ledgerRefs) => new(
         r.ReturnId, r.DocNo, r.CustomerId, r.WarehouseId, r.ReasonCodeId, r.Status, r.CreatedBy, r.CreatedAt,
+        r.GlJournalNo, r.GlPostedAt,
         r.Lines.OrderBy(l => l.ReturnLineId)
             .Select(l => new SalesReturnLineDto(l.ReturnLineId, l.SalesInvoiceLineId, l.ItemId, l.Qty)).ToList(),
         ledgerRefs);

Backend/ERPCore/Services/SalesSlipService.cs

@@ -17,6 +17,7 @@ namespace ERPCore.Services;
 public sealed class SalesSlipService : ISalesSlipService
 {
     private readonly IRepository<SalesSlip> _slips;
+    private readonly IRepository<SalesDayEnd> _dayEnds;
     private readonly IRepository<Customer> _customers;
     private readonly IRepository<Item> _items;
     private readonly IRepository<Uom> _uoms;
@@ -31,12 +32,13 @@ public sealed class SalesSlipService : ISalesSlipService
     private readonly IUnitOfWork _uow;
 
     public SalesSlipService(
-        IRepository<SalesSlip> slips, IRepository<Customer> customers, IRepository<Item> items,
+        IRepository<SalesSlip> slips, IRepository<SalesDayEnd> dayEnds, IRepository<Customer> customers, IRepository<Item> items,
         IRepository<Uom> uoms, IRepository<Warehouse> warehouses, IRepository<User> users, ISalesDomainService sales, ISalesPostingService posting, ISalesMappingService mapping,
         ISalesDocumentWorkflowService workflow,
         ICurrentUser currentUser, INumberSequenceService numbers, IUnitOfWork uow)
     {
         _slips = slips;
+        _dayEnds = dayEnds;
         _customers = customers;
         _items = items;
         _uoms = uoms;
@@ -107,22 +109,37 @@ public sealed class SalesSlipService : ISalesSlipService
     {
         await _sales.ValidateSalesHeaderAsync(request.CustomerId, request.WarehouseId, request.CashierUserId, true, ct);
 
-        var slip = new SalesSlip
-        {
-            SlipNo = await _numbers.NextAsync(DocumentTypes.SalesSlip, ct),
-            SlipDate = DateTime.UtcNow,
-            CustomerId = request.CustomerId,
-            WarehouseId = request.WarehouseId,
-            CashierUserId = request.CashierUserId,
-            Status = SalesSlipStatus.Draft,
-            CreatedAt = DateTime.UtcNow
-        };
-        slip.CustomerSnapshotName = await _customers.Query().Where(x => x.CustomerId == request.CustomerId).Select(x => x.DisplayName ?? x.Name).FirstAsync(ct);
-        slip.Lines = await BuildLinesAsync(request.WarehouseId, request.Lines, ct);
-        Recalculate(slip);
+        // A cashier can't ring up more sales for a business date they've already closed
+        // (SalesDayEndService.CloseAsync) — otherwise the new slip would sit outside every
+        // day-end's totals and GL posting forever (docs/14 Sales Day End).
+        var today = DateOnly.FromDateTime(DateTime.UtcNow);
+        var alreadyClosed = await _dayEnds.Query().AsNoTracking()
+            .AnyAsync(x => x.CashierUserId == request.CashierUserId && x.BusinessDate == today, ct);
+        if (alreadyClosed)
+            throw new ConflictException($"Cashier {request.CashierUserId} already closed today's ({today:yyyy-MM-dd}) sales — day-end has been posted.");
+
+        var customerSnapshotName = await _customers.Query().Where(x => x.CustomerId == request.CustomerId).Select(x => x.DisplayName ?? x.Name).FirstAsync(ct);
+        var lines = await BuildLinesAsync(request.WarehouseId, request.Lines, ct);
+
+        var slip = await _uow.ExecuteInTransactionAsync(async token =>
+        {
+            var entity = new SalesSlip
+            {
+                SlipNo = await _numbers.NextAsync(DocumentTypes.SalesSlip, token),
+                SlipDate = DateTime.UtcNow,
+                CustomerId = request.CustomerId,
+                WarehouseId = request.WarehouseId,
+                CashierUserId = request.CashierUserId,
+                CustomerSnapshotName = customerSnapshotName,
+                Status = SalesSlipStatus.Draft,
+                CreatedAt = DateTime.UtcNow,
+                Lines = lines
+            };
+            Recalculate(entity);
+            await _slips.AddAsync(entity, token);
+            return entity;
+        }, ct);
 
-        await _slips.AddAsync(slip, ct);
-        await _uow.SaveChangesAsync(ct);
         return new ETagged<SalesSlipDto>(_mapping.MapSlip(slip), slip.RowVersion);
     }
 

Backend/ERPCore/Services/TransferService.cs

@@ -17,6 +17,14 @@ namespace ERPCore.Services;
 /// layers (row-locked; negative-stock blocked) and records the value-weighted cost
 /// on the line; receive recreates the destination layer at that cost
 /// (cost-preserving — no revaluation). Both run in a single UoW transaction.
+///
+/// Deliberately posts no GL journal entry: <see cref="Warehouse"/> carries no GL
+/// account of its own (unlike a GL "location"/cost-center dimension), so every
+/// warehouse's stock sits in the same Inventory account — a transfer would debit and
+/// credit that identical account for the identical amount, a no-op journal entry that
+/// exists only to say nothing. The per-warehouse movement is still fully recorded in
+/// <see cref="StockLedger"/>/<see cref="StockLayer"/>, which is what On-Hand-by-warehouse
+/// reporting actually reads from.
 /// </summary>
 public sealed class TransferService : ITransferService
 {

Backend/ERPCore/System/Errors/ErrorCodes.cs

@@ -70,4 +70,16 @@ public static class ErrorCodes
 
     // General Ledger service proxy (GeneralLedgerController → external GL service, docs/12)
     public const string GlServiceUnavailable = "GL_SERVICE_UNAVAILABLE";
+    // General Ledger typed internal calls (GRN receipt/payment posting, docs/12 §5's deferred work)
+    public const string GlRequestFailed = "GL_REQUEST_FAILED";
+
+    // GRN payments
+    public const string GrnNotPayable = "GRN_NOT_PAYABLE";
+    public const string GrnPaymentExceedsBalance = "GRN_PAYMENT_EXCEEDS_BALANCE";
+    public const string GrnBankAccountNotFound = "GRN_BANK_ACCOUNT_NOT_FOUND";
+
+    // Sales invoice payments
+    public const string SalesInvoiceNotPayable = "SALES_INVOICE_NOT_PAYABLE";
+    public const string SalesInvoicePaymentExceedsBalance = "SALES_INVOICE_PAYMENT_EXCEEDS_BALANCE";
+    public const string SalesInvoiceBankAccountNotFound = "SALES_INVOICE_BANK_ACCOUNT_NOT_FOUND";
 }

Backend/ERPCore/appsettings.json

@@ -26,5 +26,26 @@
     "BaseUrl": "https://localhost:7024/api/v1/",
     "ApiKey": "1A5FE0E389C029B1FBCD2A94650CEBF0656083BF06FF48E5E11987040ABA262D"
   },
+  "Grn": {
+    "GlInventoryAccountCode": "1100",
+    "GlVatRecoverableAccountCode": "1200",
+    "GlClearingAccountCode": "2000"
+  },
+  "SalesDayEnd": {
+    "GlCashAccountCode": "1000-01",
+    "GlSalesRevenueAccountCode": "4000",
+    "GlSalesDiscountAccountCode": "4100",
+    "GlTaxPayableAccountCode": "2100",
+    "GlCogsAccountCode": "5000",
+    "GlInventoryAccountCode": "1100"
+  },
+  "Adjustment": {
+    "GlInventoryAccountCode": "1100",
+    "GlGainAccountCode": "4200",
+    "GlLossAccountCode": "5100"
+  },
+  "SalesInvoice": {
+    "GlAccountsReceivableCode": "1300"
+  },
   "AllowedHosts": "*"
 }

Frontend/erp-system/app/dashboard/ledgers/general-ledger/page.tsx

@@ -1,6 +1,6 @@
 "use client"
 
-import { Fragment, useEffect, useState } from "react"
+import { useEffect, useState } from "react"
 import Link from "next/link"
 import { ArrowLeft, BookOpen } from "lucide-react"
 
@@ -62,7 +62,7 @@ export default function GeneralLedgerReportPage() {
         </Link>
         <div>
           <h1 className="text-2xl font-bold text-foreground">General Ledger</h1>
-          <p className="text-base text-muted-foreground">Every posted movement on every account, with a running balance per account.</p>
+          <p className="text-base text-muted-foreground">Every posted movement, grouped by transaction so every leg of a GRN, Sale, or other journal entry sits together.</p>
         </div>
       </div>
 
@@ -108,37 +108,32 @@ export default function GeneralLedgerReportPage() {
           <Table className="mt-4 text-base">
             <TableHeader>
               <TableRow>
+                <TableHead className="h-11 px-3 text-sm">Account Code</TableHead>
+                <TableHead className="h-11 px-3 text-sm">Account Name</TableHead>
                 <TableHead className="h-11 px-3 text-sm">Date</TableHead>
-                <TableHead className="h-11 px-3 text-sm">Journal No.</TableHead>
-                <TableHead className="h-11 px-3 text-sm">Narration</TableHead>
+                <TableHead className="h-11 px-3 text-sm">Description</TableHead>
                 <TableHead className="h-11 px-3 text-right text-sm">Debit</TableHead>
                 <TableHead className="h-11 px-3 text-right text-sm">Credit</TableHead>
-                <TableHead className="h-11 px-3 text-right text-sm">Running balance</TableHead>
+
               </TableRow>
             </TableHeader>
             <TableBody>
-              {rows.map((row, i) => {
-                const isNewAccount = i === 0 || row.accountCode !== rows[i - 1].accountCode
-                return (
-                  <Fragment key={i}>
-                    {isNewAccount && (
-                      <TableRow className="bg-muted/40 hover:bg-muted/40">
-                        <TableCell colSpan={6} className="px-3 py-2 font-semibold">
-                          {row.accountCode} — {row.accountName}
-                        </TableCell>
-                      </TableRow>
-                    )}
-                    <TableRow>
-                      <TableCell className="px-3 py-2.5">{formatReportDate(row.entryDate)}</TableCell>
-                      <TableCell className="px-3 py-2.5 font-medium">{row.journalNo}</TableCell>
-                      <TableCell className="px-3 py-2.5 text-muted-foreground">{row.narration ?? "—"}</TableCell>
-                      <TableCell className="px-3 py-2.5 text-right tabular-nums">{formatAmount(row.debitAmount, true)}</TableCell>
-                      <TableCell className="px-3 py-2.5 text-right tabular-nums">{formatAmount(row.creditAmount, true)}</TableCell>
-                      <TableCell className="px-3 py-2.5 text-right font-medium tabular-nums">{formatAmount(row.runningBalance)}</TableCell>
-                    </TableRow>
-                  </Fragment>
-                )
-              })}
+              {/* Grouped by transaction (entryDate, then journalNo) rather than by account, so every
+                  leg of the same GRN/Sale/journal — the inventory line, the VAT line, the AP line —
+                  lands on adjacent rows instead of being scattered under separate account blocks. */}
+              {[...rows]
+                .sort((a, b) => a.entryDate.localeCompare(b.entryDate) || a.journalNo.localeCompare(b.journalNo))
+                .map((row, i) => (
+                  <TableRow key={i}>
+                    <TableCell className="px-3 py-2.5 font-medium">{row.accountCode}</TableCell>
+                    <TableCell className="px-3 py-2.5">{row.accountName}</TableCell>
+                    <TableCell className="px-3 py-2.5">{formatReportDate(row.entryDate)}</TableCell>
+                    <TableCell className="px-3 py-2.5 text-muted-foreground">{row.narration ?? "—"}</TableCell>
+                    <TableCell className="px-3 py-2.5 text-right tabular-nums">{formatAmount(row.debitAmount, true)}</TableCell>
+                    <TableCell className="px-3 py-2.5 text-right tabular-nums">{formatAmount(row.creditAmount, true)}</TableCell>
+               
+                  </TableRow>
+                ))}
             </TableBody>
           </Table>
         </div>

Frontend/erp-system/app/dashboard/procurement/purchase-orders/[id]/page.tsx

@@ -16,6 +16,7 @@ import { cn } from "@/lib/utils"
 import { CreatePoLineInput, PurchaseOrder } from "@/types/procurement"
 import { ItemListItem, Uom, Vendor, Warehouse } from "@/types/master-data"
 
+import { AlertDialog, AlertDialogContent, AlertDialogTrigger } from "@/components/ui/alert-dialog"
 import { Button, buttonVariants } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
 import { FieldError } from "@/components/ui/field"
@@ -199,7 +200,6 @@ export default function PurchaseOrderDetailPage() {
 
   async function handleDelete() {
     if (!po) return
-    if (!window.confirm(`Delete draft ${po.docNo}? This cannot be undone.`)) return
     setSaveError(null)
     setDeleting(true)
     try {
@@ -280,10 +280,21 @@ export default function PurchaseOrderDetailPage() {
                 <Check className="size-5" />
                 {submitting ? "Approving�" : "Approve"}
               </Button>
-              <Button variant="destructive" size="lg" onClick={handleDelete} disabled={deleting || submitting}>
-                <Trash2 className="size-5" />
-                {deleting ? "Deleting…" : "Delete draft"}
-              </Button>
+              <AlertDialog>
+                <AlertDialogTrigger
+                  render={<Button variant="destructive" size="lg" disabled={deleting || submitting} />}
+                >
+                  <Trash2 className="size-5" />
+                  {deleting ? "Deleting…" : "Delete draft"}
+                </AlertDialogTrigger>
+                <AlertDialogContent
+                  variant="destructive"
+                  title={`Delete draft ${po.docNo}?`}
+                  description="This cannot be undone."
+                  confirmLabel="Delete"
+                  onConfirm={handleDelete}
+                />
+              </AlertDialog>
             </>
           )}
           {cancellable && !showCancelForm && (

Frontend/erp-system/app/dashboard/procurement/purchase-orders/page.tsx

@@ -11,6 +11,7 @@ import { PurchaseOrderStatus, PurchaseOrderSummary } from "@/types/procurement"
 import { Vendor } from "@/types/master-data"
 import { PaginationMeta } from "@/types/common"
 import { cn } from "@/lib/utils"
+import { AlertDialog, AlertDialogContent, AlertDialogTrigger } from "@/components/ui/alert-dialog"
 import { Button, buttonVariants } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
 import { Skeleton } from "@/components/ui/skeleton"
@@ -64,7 +65,6 @@ export default function PurchaseOrdersListPage() {
   }
 
   async function handleDelete(po: PurchaseOrderSummary) {
-    if (!window.confirm(`Delete draft ${po.docNo}? This cannot be undone.`)) return
     setDeletingId(po.poId)
     try {
       await purchaseOrdersApi.remove(po.poId)
@@ -78,7 +78,6 @@ export default function PurchaseOrdersListPage() {
   }
 
   async function handleApprove(po: PurchaseOrderSummary) {
-    if (!window.confirm(`Approve ${po.docNo}? It will be locked for editing once approved.`)) return
     setApprovingId(po.poId)
     try {
       const updated = await purchaseOrdersApi.submit(po.poId)
@@ -203,30 +202,54 @@ export default function PurchaseOrdersListPage() {
                             >
                               <Pencil className="size-4" />
                             </Link>
-                            <Button
-                              type="button"
-                              variant="ghost"
-                              size="icon"
-                              aria-label="Approve draft"
-                              title="Approve draft"
-                              disabled={approvingId === po.poId || deletingId === po.poId}
-                              onClick={() => handleApprove(po)}
-                              className="text-success hover:bg-success/10 hover:text-success"
-                            >
-                              <Check className="size-4" />
-                            </Button>
-                            <Button
-                              type="button"
-                              variant="ghost"
-                              size="icon"
-                              aria-label="Delete draft"
-                              title="Delete draft"
-                              disabled={deletingId === po.poId || approvingId === po.poId}
-                              onClick={() => handleDelete(po)}
-                              className="text-destructive hover:bg-destructive/10 hover:text-destructive"
-                            >
-                              <Trash2 className="size-4" />
-                            </Button>
+                            <AlertDialog>
+                              <AlertDialogTrigger
+                                render={
+                                  <Button
+                                    type="button"
+                                    variant="ghost"
+                                    size="icon"
+                                    aria-label="Approve draft"
+                                    title="Approve draft"
+                                    disabled={approvingId === po.poId || deletingId === po.poId}
+                                    className="text-success hover:bg-success/10 hover:text-success"
+                                  />
+                                }
+                              >
+                                <Check className="size-4" />
+                              </AlertDialogTrigger>
+                              <AlertDialogContent
+                                variant="success"
+                                title={`Approve ${po.docNo}?`}
+                                description="It will be locked for editing once approved."
+                                confirmLabel="Approve"
+                                onConfirm={() => handleApprove(po)}
+                              />
+                            </AlertDialog>
+                            <AlertDialog>
+                              <AlertDialogTrigger
+                                render={
+                                  <Button
+                                    type="button"
+                                    variant="ghost"
+                                    size="icon"
+                                    aria-label="Delete draft"
+                                    title="Delete draft"
+                                    disabled={deletingId === po.poId || approvingId === po.poId}
+                                    className="text-destructive hover:bg-destructive/10 hover:text-destructive"
+                                  />
+                                }
+                              >
+                                <Trash2 className="size-4" />
+                              </AlertDialogTrigger>
+                              <AlertDialogContent
+                                variant="destructive"
+                                title={`Delete draft ${po.docNo}?`}
+                                description="This cannot be undone."
+                                confirmLabel="Delete"
+                                onConfirm={() => handleDelete(po)}
+                              />
+                            </AlertDialog>
                           </>
                         )}
                       </div>

Frontend/erp-system/app/dashboard/procurement/purchase-returns/page.tsx

@@ -91,6 +91,7 @@ export default function PurchaseReturnsListPage() {
               <TableHead className="h-12 px-3 text-sm">Warehouse</TableHead>
               <TableHead className="h-12 px-3 text-sm">Reason</TableHead>
               <TableHead className="h-12 px-3 text-sm">Status</TableHead>
+              <TableHead className="h-12 px-3 text-sm">GL Journal</TableHead>
               <TableHead className="h-12 px-3 text-sm">Created</TableHead>
             </TableRow>
           </TableHeader>
@@ -106,6 +107,7 @@ export default function PurchaseReturnsListPage() {
                     {r.status}
                   </Badge>
                 </TableCell>
+                <TableCell className="px-3 py-3.5 text-muted-foreground">{r.glJournalNo ?? "—"}</TableCell>
                 <TableCell className="px-3 py-3.5">{new Date(r.createdAt).toLocaleString()}</TableCell>
               </TableRow>
             ))}

Frontend/erp-system/app/dashboard/production/produced/page.tsx

@@ -0,0 +1,242 @@
+"use client"
+
+import { useCallback, useEffect, useState } from "react"
+import { useRouter } from "next/navigation"
+import { PackageCheck } from "lucide-react"
+
+import { cn } from "@/lib/utils"
+import { productionRunsApi } from "@/lib/api/production-runs"
+import { productionTemplatesApi } from "@/lib/api/production-templates"
+import { warehousesApi } from "@/lib/api/warehouses"
+import { errorMessage } from "@/lib/error-map"
+import { ProducedListResponse, ProductionRunStatus, ProductionTemplateSummary } from "@/types/production"
+import { Warehouse } from "@/types/master-data"
+
+import { Badge } from "@/components/ui/badge"
+import { Button } from "@/components/ui/button"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
+import { Skeleton } from "@/components/ui/skeleton"
+import { Table, TableBody, TableCell, TableFooter, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+
+type StatusFilter = ProductionRunStatus | "All"
+
+function runStatusBadgeClass(status: ProductionRunStatus) {
+  if (status === "Completed") return "bg-success/10 text-success"
+  if (status === "Cancelled") return "bg-destructive/10 text-destructive"
+  return "bg-info/10 text-info"
+}
+
+// 6dp on the wire (matches the server's PostReceiptAsync rounding); shown to 4dp so the unit
+// cost of a fractional-value item is still legible without dragging the whole table wide.
+function formatCost(value: number) {
+  return value.toLocaleString(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 4 })
+}
+
+export default function ProducedItemsPage() {
+  const router = useRouter()
+
+  // null = still loading (the codebase convention for "no data yet" vs "empty result").
+  const [data, setData] = useState<ProducedListResponse | null>(null)
+  const [loadError, setLoadError] = useState<string | null>(null)
+
+  const [templates, setTemplates] = useState<ProductionTemplateSummary[]>([])
+  const [warehouses, setWarehouses] = useState<Warehouse[]>([])
+
+  const [from, setFrom] = useState("")
+  const [to, setTo] = useState("")
+  const [templateId, setTemplateId] = useState<number | null>(null)
+  const [warehouseId, setWarehouseId] = useState<number | null>(null)
+  const [status, setStatus] = useState<StatusFilter>("All")
+
+  const load = useCallback(() => {
+    setLoadError(null)
+    productionRunsApi
+      .listProduced({
+        from: from || undefined,
+        to: to || undefined,
+        templateId: templateId ?? undefined,
+        warehouseId: warehouseId ?? undefined,
+        status: status === "All" ? undefined : status,
+      })
+      .then(setData)
+      .catch((err) => {
+        setData({ items: [], summary: { runCount: 0, totalProducedQty: 0, totalScrappedQty: 0, totalGoodQty: 0, totalCost: 0 } })
+        setLoadError(errorMessage(err))
+      })
+  }, [from, to, templateId, warehouseId, status])
+
+  useEffect(load, [load])
+
+  useEffect(() => {
+    Promise.all([productionTemplatesApi.list({ pageSize: 200 }), warehousesApi.list({ pageSize: 200 })])
+      .then(([templateRes, warehouseRes]) => {
+        setTemplates(templateRes.items)
+        setWarehouses(warehouseRes.items)
+      })
+      .catch((err) => setLoadError(errorMessage(err)))
+  }, [])
+
+  const hasFilters = from !== "" || to !== "" || templateId !== null || warehouseId !== null || status !== "All"
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div>
+        <h1 className="text-2xl font-bold text-foreground">Produced Items</h1>
+        <p className="text-base text-muted-foreground">
+          Finished-goods lines produced by runs, with the roll-up cost of production (FR-MFG-13).
+        </p>
+      </div>
+
+      <div className="grid grid-cols-1 gap-3 sm:grid-cols-2 lg:grid-cols-5">
+        <div className="flex flex-col gap-1.5">
+          <Label className="text-base">From</Label>
+          <Input type="date" value={from} onChange={(e) => setFrom(e.target.value)} className="h-11 text-base" />
+        </div>
+        <div className="flex flex-col gap-1.5">
+          <Label className="text-base">To</Label>
+          <Input type="date" value={to} onChange={(e) => setTo(e.target.value)} className="h-11 text-base" />
+        </div>
+        <div className="flex flex-col gap-1.5">
+          <Label className="text-base">Template</Label>
+          <Select<number | null> value={templateId} onValueChange={setTemplateId}>
+            <SelectTrigger className="h-11! w-full text-base">
+              <SelectValue placeholder="All templates" />
+            </SelectTrigger>
+            <SelectContent>
+              {templates.map((t) => (
+                <SelectItem key={t.templateId} value={t.templateId} className="text-base">{t.name}</SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+        </div>
+        <div className="flex flex-col gap-1.5">
+          <Label className="text-base">Warehouse</Label>
+          <Select<number | null> value={warehouseId} onValueChange={setWarehouseId}>
+            <SelectTrigger className="h-11! w-full text-base">
+              <SelectValue placeholder="All warehouses" />
+            </SelectTrigger>
+            <SelectContent>
+              {warehouses.map((w) => (
+                <SelectItem key={w.warehouseId} value={w.warehouseId} className="text-base">{w.name}</SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+        </div>
+        <div className="flex flex-col gap-1.5">
+          <Label className="text-base">Status</Label>
+          <Select<StatusFilter> value={status} onValueChange={(v) => setStatus(v ?? "All")}>
+            <SelectTrigger className="h-11! w-full text-base">
+              <SelectValue />
+            </SelectTrigger>
+            <SelectContent>
+              <SelectItem value="All" className="text-base">All statuses</SelectItem>
+              <SelectItem value="InProgress" className="text-base">In Progress</SelectItem>
+              <SelectItem value="Completed" className="text-base">Completed</SelectItem>
+              <SelectItem value="Cancelled" className="text-base">Cancelled</SelectItem>
+            </SelectContent>
+          </Select>
+        </div>
+      </div>
+
+      {hasFilters && (
+        <Button
+          variant="ghost"
+          size="sm"
+          className="w-fit"
+          onClick={() => {
+            setFrom("")
+            setTo("")
+            setTemplateId(null)
+            setWarehouseId(null)
+            setStatus("All")
+          }}
+        >
+          Clear filters
+        </Button>
+      )}
+
+      {loadError && (
+        <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{loadError}</div>
+      )}
+
+      {data === null ? (
+        <div className="flex flex-col gap-3">
+          <Skeleton className="h-14 w-full" />
+          <Skeleton className="h-14 w-full" />
+          <Skeleton className="h-14 w-full" />
+        </div>
+      ) : data.items.length === 0 ? (
+        <div className="flex flex-col items-center gap-4 rounded-xl border border-dashed py-20 text-center">
+          <PackageCheck className="size-12 text-muted-foreground" />
+          <p className="text-base text-muted-foreground">
+            {hasFilters ? "No produced lines match your filter." : "No runs have produced anything yet."}
+          </p>
+        </div>
+      ) : (
+        <div className="overflow-x-auto rounded-xl border">
+          <Table className="text-base">
+            <TableHeader>
+              <TableRow>
+                <TableHead className="h-12 px-3 text-sm">Doc No</TableHead>
+                <TableHead className="h-12 px-3 text-sm">Status</TableHead>
+                <TableHead className="h-12 px-3 text-sm">Template</TableHead>
+                <TableHead className="h-12 px-3 text-sm">Warehouse</TableHead>
+                <TableHead className="h-12 px-3 text-sm">Item</TableHead>
+                <TableHead className="h-12 px-3 text-right text-sm">Produced</TableHead>
+                <TableHead className="h-12 px-3 text-right text-sm">Scrapped</TableHead>
+                <TableHead className="h-12 px-3 text-right text-sm">Good Qty</TableHead>
+                <TableHead className="h-12 px-3 text-right text-sm">Unit Cost</TableHead>
+                <TableHead className="h-12 px-3 text-right text-sm">Cost of Production</TableHead>
+                <TableHead className="h-12 px-3 text-sm">Completed</TableHead>
+              </TableRow>
+            </TableHeader>
+            <TableBody>
+              {data.items.map((line) => (
+                <TableRow
+                  key={line.runId}
+                  className="cursor-pointer"
+                  onClick={() => router.push(`/dashboard/production/runs/${line.runId}`)}
+                >
+                  <TableCell className="px-3 py-3.5 font-medium text-foreground">{line.docNo}</TableCell>
+                  <TableCell className="px-3 py-3.5">
+                    <Badge variant="outline" className={cn("h-6 w-fit justify-center border-transparent px-2.5 text-sm", runStatusBadgeClass(line.status))}>
+                      {line.status === "InProgress" ? "In Progress" : line.status}
+                    </Badge>
+                  </TableCell>
+                  <TableCell className="px-3 py-3.5">{line.templateName}</TableCell>
+                  <TableCell className="px-3 py-3.5">{line.warehouseName}</TableCell>
+                  <TableCell className="px-3 py-3.5">{line.itemName}</TableCell>
+                  <TableCell className="px-3 py-3.5 text-right">{line.producedQty.toLocaleString()}</TableCell>
+                  <TableCell className="px-3 py-3.5 text-right">{line.scrappedQty.toLocaleString()}</TableCell>
+                  <TableCell className="px-3 py-3.5 text-right">{line.goodQty.toLocaleString()}</TableCell>
+                  <TableCell className="px-3 py-3.5 text-right">{formatCost(line.unitCost)}</TableCell>
+                  <TableCell className="px-3 py-3.5 text-right font-medium">{formatCost(line.totalCost)}</TableCell>
+                  <TableCell className="px-3 py-3.5 text-muted-foreground">
+                    {line.completedAt ? new Date(line.completedAt).toLocaleDateString() : "—"}
+                  </TableCell>
+                </TableRow>
+              ))}
+            </TableBody>
+            <TableFooter>
+              <TableRow>
+                <TableCell className="px-3 py-3.5 font-semibold" colSpan={5}>
+                  Total ({data.summary.runCount} run{data.summary.runCount === 1 ? "" : "s"})
+                </TableCell>
+                <TableCell className="px-3 py-3.5 text-right font-semibold">{data.summary.totalProducedQty.toLocaleString()}</TableCell>
+                <TableCell className="px-3 py-3.5 text-right font-semibold">{data.summary.totalScrappedQty.toLocaleString()}</TableCell>
+                <TableCell className="px-3 py-3.5 text-right font-semibold">{data.summary.totalGoodQty.toLocaleString()}</TableCell>
+                <TableCell className="px-3 py-3.5" />
+                <TableCell className="px-3 py-3.5 text-right font-semibold">
+                  Cost of Production: {formatCost(data.summary.totalCost)}
+                </TableCell>
+                <TableCell className="px-3 py-3.5" />
+              </TableRow>
+            </TableFooter>
+          </Table>
+        </div>
+      )}
+    </div>
+  )
+}

Frontend/erp-system/app/dashboard/receiving/grn/[id]/page.tsx

@@ -3,7 +3,7 @@
 import { useEffect, useRef, useState } from "react"
 import { useParams } from "next/navigation"
 import Link from "next/link"
-import { CheckCircle2, PackageCheck, PackageX, ShieldAlert, XCircle } from "lucide-react"
+import { BookOpen, CheckCircle2, CircleDollarSign, PackageCheck, PackageX, ShieldAlert, XCircle } from "lucide-react"
 
 import { grnsApi } from "@/lib/api/grns"
 import { warehousesApi } from "@/lib/api/warehouses"
@@ -11,8 +11,9 @@ import { itemsApi } from "@/lib/api/items"
 import { uomsApi } from "@/lib/api/uoms"
 import { baseUomLabel } from "@/lib/uom-label"
 import { errorMessage } from "@/lib/error-map"
+import { formatAmount } from "@/lib/format"
 import { cn } from "@/lib/utils"
-import { ConfirmGrnResponse, Grn } from "@/types/grn"
+import { ConfirmGrnResponse, Grn, GrnPayment } from "@/types/grn"
 import { Bin, ItemListItem, Uom } from "@/types/master-data"
 
 import { Badge } from "@/components/ui/badge"
@@ -20,7 +21,8 @@ import { Button, buttonVariants } from "@/components/ui/button"
 import { Skeleton } from "@/components/ui/skeleton"
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
 import { toast } from "@/components/ui/toast"
-import { GrnStatusBadge, HoldStatusBadge } from "@/components/receiving/status-badges"
+import { GrnPaymentStatusBadge, GrnStatusBadge, HoldStatusBadge } from "@/components/receiving/status-badges"
+import { GrnPaymentDialog } from "@/components/receiving/GrnPaymentDialog"
 
 export default function GrnDetailPage() {
   const params = useParams<{ id: string }>()
@@ -36,6 +38,9 @@ export default function GrnDetailPage() {
   const [confirmResult, setConfirmResult] = useState<ConfirmGrnResponse | null>(null)
   const [releasingLineId, setReleasingLineId] = useState<number | null>(null)
 
+  const [payments, setPayments] = useState<GrnPayment[]>([])
+  const [payDialogOpen, setPayDialogOpen] = useState(false)
+
   // Stable per detail-page-session key so a retried confirm click doesn't double-post.
   const idempotencyKey = useRef(crypto.randomUUID())
 
@@ -55,6 +60,18 @@ export default function GrnDetailPage() {
     warehousesApi.listBins(grn.warehouseId).then(setBins).catch(() => setBins([]))
   }, [grn?.warehouseId])
 
+  useEffect(() => {
+    if (!grn || grn.status === "Draft") return
+    grnsApi.listPayments(grn.grnId).then(setPayments).catch(() => setPayments([]))
+  }, [grn?.grnId, grn?.status])
+
+  function handlePaid(_updated: Grn, payment: GrnPayment) {
+    setGrn((prev) =>
+      prev ? { ...prev, paidAmount: prev.paidAmount + payment.amount, balanceAmount: prev.balanceAmount - payment.amount } : prev
+    )
+    setPayments((prev) => [payment, ...prev])
+  }
+
   function itemFor(itemId: number) {
     return items.find((i) => i.itemId === itemId)
   }
@@ -70,8 +87,10 @@ export default function GrnDetailPage() {
     try {
       const result = await grnsApi.confirm(grn.grnId, idempotencyKey.current)
       setConfirmResult(result)
-      setGrn((prev) => (prev ? { ...prev, status: result.status } : prev))
-      toast.success("GRN confirmed", `${result.createdLayers.length} layer(s) posted to stock.`)
+      setGrn((prev) =>
+        prev ? { ...prev, status: result.status, glJournalNo: result.glJournalNo, balanceAmount: result.balanceAmount } : prev
+      )
+      toast.success("GRN confirmed", `${result.createdLayers.length} layer(s) posted to stock. Journal ${result.glJournalNo}.`)
     } catch (err) {
       setError(errorMessage(err))
       toast.error("Could not confirm GRN", errorMessage(err))
@@ -121,6 +140,7 @@ export default function GrnDetailPage() {
             <div className="flex items-center gap-3">
               <h1 className="text-2xl font-bold text-foreground">{grn.docNo}</h1>
               <GrnStatusBadge status={grn.status} />
+              {grn.status !== "Draft" && <GrnPaymentStatusBadge paidAmount={grn.paidAmount} balanceAmount={grn.balanceAmount} />}
             </div>
             <p className="text-base text-muted-foreground">
               {grn.poId ? `Against PO #${grn.poId}` : "Direct receipt"} — Vendor #{grn.vendorId} — Warehouse #{grn.warehouseId}
@@ -128,14 +148,36 @@ export default function GrnDetailPage() {
           </div>
         </div>
 
-        {grn.status === "Draft" && (
-          <Button size="lg" onClick={handleConfirm} disabled={confirming}>
-            <PackageCheck className="size-5" />
-            {confirming ? "Confirming…" : "Confirm GRN"}
-          </Button>
-        )}
+        <div className="flex items-center gap-2">
+          {grn.status !== "Draft" && (
+            <>
+              <Link
+                href="/dashboard/ledgers/general-ledger"
+                className={cn(buttonVariants({ variant: "outline", size: "lg" }))}
+                title="View this GRN's postings in the General Ledger report"
+              >
+                <BookOpen className="size-5" />
+                View in Ledger
+              </Link>
+              {grn.balanceAmount > 0 && (
+                <Button size="lg" onClick={() => setPayDialogOpen(true)}>
+                  <CircleDollarSign className="size-5" />
+                  Pay
+                </Button>
+              )}
+            </>
+          )}
+          {grn.status === "Draft" && (
+            <Button size="lg" onClick={handleConfirm} disabled={confirming}>
+              <PackageCheck className="size-5" />
+              {confirming ? "Confirming…" : "Confirm GRN"}
+            </Button>
+          )}
+        </div>
       </div>
 
+      <GrnPaymentDialog grn={grn} open={payDialogOpen} onOpenChange={setPayDialogOpen} onPaid={handlePaid} />
+
       {error && (
         <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>
       )}
@@ -150,6 +192,7 @@ export default function GrnDetailPage() {
             Layers: {confirmResult.createdLayers.map((l) => `#${l.layerId} (${l.qtyReceived} @ ${l.unitCost})`).join(", ")}
           </div>
           <div className="text-sm text-muted-foreground">Ledger refs: {confirmResult.ledgerRefs.join(", ")}</div>
+          <div className="text-sm text-muted-foreground">GL journal entry: {confirmResult.glJournalNo}</div>
           {confirmResult.poStatus && <div className="text-sm text-muted-foreground">PO status: {confirmResult.poStatus}</div>}
         </div>
       )}
@@ -258,7 +301,7 @@ export default function GrnDetailPage() {
       </Table>
       </div>
 
-      <div className="flex justify-end gap-8 border-t border-border pt-4 text-base">
+      <div className="flex flex-wrap justify-end gap-8 border-t border-border pt-4 text-base">
         <div className="flex gap-3">
           <span className="text-muted-foreground">Stock value (excl. VAT)</span>
           <span className="tabular-nums">{grn.lines.reduce((s, l) => s + l.receivedValue, 0).toFixed(2)}</span>
@@ -271,7 +314,49 @@ export default function GrnDetailPage() {
           <span className="text-muted-foreground">Document total</span>
           <span className="font-semibold tabular-nums">{grn.lines.reduce((s, l) => s + l.lineTotal, 0).toFixed(2)}</span>
         </div>
+        {grn.status !== "Draft" && (
+          <>
+            <div className="flex gap-3">
+              <span className="text-muted-foreground">Amount paid</span>
+              <span className="tabular-nums">{formatAmount(grn.paidAmount)}</span>
+            </div>
+            <div className="flex gap-3">
+              <span className="text-muted-foreground">Balance due</span>
+              <span className="font-semibold tabular-nums">{formatAmount(grn.balanceAmount)}</span>
+            </div>
+          </>
+        )}
       </div>
+
+      {grn.status !== "Draft" && payments.length > 0 && (
+        <div className="flex flex-col gap-3">
+          <h2 className="text-lg font-semibold text-foreground">Payment History</h2>
+          <div className="overflow-x-auto">
+            <Table className="text-base">
+              <TableHeader>
+                <TableRow>
+                  <TableHead className="h-12 px-3 text-sm">Date</TableHead>
+                  <TableHead className="h-12 px-3 text-sm text-right">Amount</TableHead>
+                  <TableHead className="h-12 px-3 text-sm">Account</TableHead>
+                  <TableHead className="h-12 px-3 text-sm">Reference</TableHead>
+                  <TableHead className="h-12 px-3 text-sm">GL Journal</TableHead>
+                </TableRow>
+              </TableHeader>
+              <TableBody>
+                {payments.map((p) => (
+                  <TableRow key={p.grnPaymentId}>
+                    <TableCell className="px-3 py-3.5">{new Date(p.paymentDate).toLocaleString()}</TableCell>
+                    <TableCell className="px-3 py-3.5 text-right tabular-nums">{formatAmount(p.amount)}</TableCell>
+                    <TableCell className="px-3 py-3.5">{p.bankAccountName}</TableCell>
+                    <TableCell className="px-3 py-3.5">{p.reference ?? "—"}</TableCell>
+                    <TableCell className="px-3 py-3.5">{p.glJournalNo ?? "—"}</TableCell>
+                  </TableRow>
+                ))}
+              </TableBody>
+            </Table>
+          </div>
+        </div>
+      )}
     </div>
   )
 }

Frontend/erp-system/app/dashboard/receiving/grn/new/page.tsx

@@ -134,6 +134,28 @@ export default function NewGrnPage() {
   const [lines, setLines] = useState<DraftLine[]>([emptyLine()])
   const [lineTab, setLineTab] = useState<LineTab>("lines")
 
+  // Whole-GRN discount/VAT: entering either one here applies that same rate to every
+  // line's discountPct/vatPct (clearing whatever was entered per-item), so it flows
+  // through the normal per-line NetUnitCost/FIFO-layer costing instead of being a
+  // separate header-only adjustment. Independent per field — setting one doesn't
+  // touch the other. Cleared back to blank, the per-line fields become editable again.
+  const [headerDiscountPct, setHeaderDiscountPct] = useState("")
+  const [headerVatPct, setHeaderVatPct] = useState("")
+
+  function applyHeaderDiscountPct(value: string) {
+    setHeaderDiscountPct(value)
+    const trimmed = value.trim()
+    if (trimmed === "") return
+    setLines((prev) => prev.map((l) => ({ ...l, discountPct: trimmed })))
+  }
+
+  function applyHeaderVatPct(value: string) {
+    setHeaderVatPct(value)
+    const trimmed = value.trim()
+    if (trimmed === "") return
+    setLines((prev) => prev.map((l) => ({ ...l, vatPct: trimmed })))
+  }
+
   const [headerError, setHeaderError] = useState<string | null>(null)
   const [lineErrors, setLineErrors] = useState<Record<string, Record<string, string>>>({})
   const [submitError, setSubmitError] = useState<string | null>(null)
@@ -171,6 +193,8 @@ export default function NewGrnPage() {
     setPoId(null)
     setVendorId(null)
     setLines([emptyLine()])
+    setHeaderDiscountPct("")
+    setHeaderVatPct("")
     setHeaderError(null)
     setLineErrors({})
   }
@@ -203,8 +227,8 @@ export default function NewGrnPage() {
             qty: String(l.qty - l.qtyReceived),
             unitCost: String(l.unitPrice),
             poUnitPrice: l.unitPrice,
-            discountPct: "0",
-            vatPct: "0",
+            discountPct: headerDiscountPct.trim() || "0",
+            vatPct: headerVatPct.trim() || "0",
             holdStatus: "Available",
             warrantyNumbers: [],
           })
@@ -447,6 +471,38 @@ export default function NewGrnPage() {
             <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-4 text-base text-destructive">{headerError}</div>
           )}
 
+          <div className="flex flex-col gap-2 rounded-lg border border-dashed border-input p-4 sm:flex-row sm:items-end sm:gap-4">
+            <div className="flex flex-1 flex-col gap-2">
+              <Label className="text-base">Whole-GRN discount %</Label>
+              <Input
+                type="number"
+                min="0"
+                max="100"
+                step="any"
+                value={headerDiscountPct}
+                onChange={(e) => applyHeaderDiscountPct(e.target.value)}
+                placeholder="Applies to every line"
+                className="h-11 text-base"
+              />
+            </div>
+            <div className="flex flex-1 flex-col gap-2">
+              <Label className="text-base">Whole-GRN VAT %</Label>
+              <Input
+                type="number"
+                min="0"
+                max="100"
+                step="any"
+                value={headerVatPct}
+                onChange={(e) => applyHeaderVatPct(e.target.value)}
+                placeholder="Applies to every line"
+                className="h-11 text-base"
+              />
+            </div>
+            <p className="text-sm text-muted-foreground sm:max-w-64">
+              Setting either one applies that rate to every line (replacing any per-item value) and locks the per-item field. Clear it to edit lines individually again.
+            </p>
+          </div>
+
           <div className="flex flex-col gap-3">
             <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
               <div>
@@ -460,7 +516,20 @@ export default function NewGrnPage() {
               <div className="flex flex-wrap items-center gap-2">
                 {/* Off-PO items are allowed on a PO-based GRN — the server treats a line with
                     no poLineId as a direct receipt (docs/10 FR-GRN-01, revised). */}
-                <Button type="button" variant="outline" onClick={() => setLines((prev) => [...prev, emptyLine()])}>
+                <Button
+                  type="button"
+                  variant="outline"
+                  onClick={() =>
+                    setLines((prev) => [
+                      ...prev,
+                      {
+                        ...emptyLine(),
+                        discountPct: headerDiscountPct.trim() || "0",
+                        vatPct: headerVatPct.trim() || "0",
+                      },
+                    ])
+                  }
+                >
                   <Plus className="size-5" />
                   Add line
                 </Button>
@@ -626,6 +695,8 @@ export default function NewGrnPage() {
                               value={line.discountPct}
                               aria-invalid={!!errors.discountPct}
                               onChange={(e) => updateLine(line.key, { discountPct: e.target.value })}
+                              disabled={headerDiscountPct.trim() !== ""}
+                              title={headerDiscountPct.trim() !== "" ? "Driven by the whole-GRN discount % above" : undefined}
                               className="h-11 text-sm"
                             />
                             <FieldError errors={[errors.discountPct ? { message: errors.discountPct } : undefined]} />
@@ -639,6 +710,8 @@ export default function NewGrnPage() {
                               value={line.vatPct}
                               aria-invalid={!!errors.vatPct}
                               onChange={(e) => updateLine(line.key, { vatPct: e.target.value })}
+                              disabled={headerVatPct.trim() !== ""}
+                              title={headerVatPct.trim() !== "" ? "Driven by the whole-GRN VAT % above" : undefined}
                               className="h-11 text-sm"
                             />
                             <FieldError errors={[errors.vatPct ? { message: errors.vatPct } : undefined]} />

Frontend/erp-system/app/dashboard/receiving/grn/page.tsx

@@ -6,6 +6,7 @@ import { ChevronLeft, ChevronRight, Eye, PackageSearch, Plus, Search } from "luc
 
 import { grnsApi } from "@/lib/api/grns"
 import { errorMessage } from "@/lib/error-map"
+import { formatAmount } from "@/lib/format"
 import { GrnStatus, GrnSummary } from "@/types/grn"
 import { PaginationMeta } from "@/types/common"
 import { cn } from "@/lib/utils"
@@ -22,7 +23,7 @@ import {
   TableHeader,
   TableRow,
 } from "@/components/ui/table"
-import { GrnStatusBadge } from "@/components/receiving/status-badges"
+import { GrnPaymentStatusBadge, GrnStatusBadge } from "@/components/receiving/status-badges"
 
 type StatusFilter = GrnStatus | "All"
 
@@ -174,6 +175,8 @@ export default function GrnListPage() {
                 <TableHead className="h-12 px-3 text-sm">Vendor</TableHead>
                 <TableHead className="h-12 px-3 text-sm">Warehouse</TableHead>
                 <TableHead className="h-12 px-3 text-sm">Status</TableHead>
+                <TableHead className="h-12 px-3 text-sm text-right">Balance</TableHead>
+                <TableHead className="h-12 px-3 text-sm">Payment</TableHead>
                 <TableHead className="h-12 px-3 text-sm">Created</TableHead>
                 <TableHead className="h-12 px-3 text-sm">Actions</TableHead>
               </TableRow>
@@ -196,6 +199,16 @@ export default function GrnListPage() {
                     <TableCell className="px-3 py-3.5">
                       <GrnStatusBadge status={grn.status} />
                     </TableCell>
+                    <TableCell className="px-3 py-3.5 text-right tabular-nums">
+                      {grn.status === "Draft" ? "—" : formatAmount(grn.balanceAmount)}
+                    </TableCell>
+                    <TableCell className="px-3 py-3.5">
+                      {grn.status === "Draft" ? (
+                        <span className="text-sm text-muted-foreground">—</span>
+                      ) : (
+                        <GrnPaymentStatusBadge paidAmount={grn.paidAmount} balanceAmount={grn.balanceAmount} />
+                      )}
+                    </TableCell>
                     <TableCell className="px-3 py-3.5">{new Date(grn.createdAt).toLocaleString()}</TableCell>
                     <TableCell className="px-3 py-3.5">
                       <div className="flex items-center gap-1">

Frontend/erp-system/app/dashboard/sales/bundles/page.tsx

@@ -244,8 +244,8 @@ export default function BundleSalesPage() {
                       </TableCell>
                       <TableCell className="px-4 py-3.5">{row.customerSnapshotName}</TableCell>
                       <TableCell className="px-4 py-3.5 text-muted-foreground">{new Date(row.createdAt).toLocaleDateString()}</TableCell>
-                      <TableCell className="px-4 py-3.5 text-right font-mono tabular-nums">{row.bundlePrice.toFixed(2)}</TableCell>
-                      <TableCell className="px-4 py-3.5 text-right font-mono font-semibold tabular-nums">{row.grandTotal.toFixed(2)}</TableCell>
+                      <TableCell className="px-4 py-3.5 text-right tabular-nums">{row.bundlePrice.toFixed(2)}</TableCell>
+                      <TableCell className="px-4 py-3.5 text-right font-semibold tabular-nums">{row.grandTotal.toFixed(2)}</TableCell>
                       <TableCell className="px-4 py-3.5">
                         <Badge variant="outline" className={statusClass(row.status)}>
                           {row.status}
@@ -271,11 +271,11 @@ export default function BundleSalesPage() {
               <div className="grid gap-3 text-sm md:grid-cols-2">
                 <div className="rounded-lg border bg-muted/20 px-3 py-2">
                   <div className="text-muted-foreground">Rows loaded</div>
-                  <div className="font-mono text-base font-semibold tabular-nums">{visibleRows.length}</div>
+                  <div className="text-base font-semibold tabular-nums">{visibleRows.length}</div>
                 </div>
                 <div className="rounded-lg border bg-muted/20 px-3 py-2">
                   <div className="text-muted-foreground">Grand total</div>
-                  <div className="font-mono text-base font-semibold tabular-nums">{bundleTotal.toFixed(2)}</div>
+                  <div className="text-base font-semibold tabular-nums">{bundleTotal.toFixed(2)}</div>
                 </div>
               </div>
             </div>

Frontend/erp-system/app/dashboard/sales/day-end/page.tsx

@@ -0,0 +1,281 @@
+"use client"
+
+import { useEffect, useState } from "react"
+import Link from "next/link"
+import { AlertTriangle, ArrowLeft, CheckCircle2, Lock, ReceiptText } from "lucide-react"
+
+import { salesDayEndApi } from "@/lib/api/sales-day-end"
+import { usersApi } from "@/lib/api/users"
+import { errorMessage } from "@/lib/error-map"
+import { cn } from "@/lib/utils"
+import { ManagedUser } from "@/types/users"
+import { SalesDayEnd, SalesDayEndPreview } from "@/types/sales"
+
+import { Button, buttonVariants } from "@/components/ui/button"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
+import { Skeleton } from "@/components/ui/skeleton"
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
+import { toast } from "@/components/ui/toast"
+
+function todayIso(): string {
+  return new Date().toISOString().slice(0, 10)
+}
+
+export default function SalesDayEndPage() {
+  const [cashiers, setCashiers] = useState<ManagedUser[]>([])
+  const [cashierUserId, setCashierUserId] = useState<number | null>(null)
+  const [businessDate, setBusinessDate] = useState(todayIso())
+
+  const [preview, setPreview] = useState<SalesDayEndPreview | null>(null)
+  const [previewLoading, setPreviewLoading] = useState(false)
+  const [previewError, setPreviewError] = useState<string | null>(null)
+
+  const [report, setReport] = useState<SalesDayEnd | null>(null)
+  const [closing, setClosing] = useState(false)
+
+  useEffect(() => {
+    usersApi
+      .list({ pageSize: 200 })
+      .then((res) => {
+        setCashiers(res.items)
+        setCashierUserId((prev) => prev ?? res.items[0]?.userId ?? null)
+      })
+      .catch(() => {})
+  }, [])
+
+  function loadPreview() {
+    if (!cashierUserId) return
+    setReport(null)
+    setPreviewError(null)
+    setPreviewLoading(true)
+    salesDayEndApi
+      .preview(cashierUserId, businessDate)
+      .then(setPreview)
+      .catch((err) => setPreviewError(errorMessage(err)))
+      .finally(() => setPreviewLoading(false))
+  }
+
+  useEffect(() => {
+    loadPreview()
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [cashierUserId, businessDate])
+
+  async function handleClose() {
+    if (!cashierUserId) return
+    setClosing(true)
+    try {
+      const result = await salesDayEndApi.close({ cashierUserId, businessDate })
+      setReport(result)
+      toast.success("Day closed", `${result.docNo} — ${result.slipCount} slip(s), ${result.bundleCount} bundle(s), ${result.grandTotal.toFixed(2)} total.`)
+      loadPreview()
+    } catch (err) {
+      toast.error("Could not close the day", errorMessage(err))
+    } finally {
+      setClosing(false)
+    }
+  }
+
+  const cashierName = cashiers.find((c) => c.userId === cashierUserId)?.displayName
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex items-center gap-3">
+        <Link href="/dashboard/sales" className={cn(buttonVariants({ variant: "outline", size: "icon" }))}>
+          <ArrowLeft className="size-4" />
+        </Link>
+        <div>
+          <h1 className="text-2xl font-bold text-foreground">Day End</h1>
+          <p className="text-base text-muted-foreground">
+            Close a cashier's business day — locks their posted sales slips and bundle sales, and posts one consolidated journal entry to the ledger.
+          </p>
+        </div>
+      </div>
+
+      <div className="grid grid-cols-1 gap-4 rounded-2xl border border-border bg-card p-5 shadow-[var(--shadow-panel)] sm:grid-cols-3">
+        <div className="flex flex-col gap-2">
+          <Label className="text-base">Cashier</Label>
+          <Select<number | null> value={cashierUserId} onValueChange={setCashierUserId}>
+            <SelectTrigger className="h-12! w-full text-base">
+              <SelectValue placeholder="Select cashier" />
+            </SelectTrigger>
+            <SelectContent>
+              {cashiers.map((c) => (
+                <SelectItem key={c.userId} value={c.userId} className="text-base">
+                  {c.displayName}
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+        </div>
+        <div className="flex flex-col gap-2">
+          <Label className="text-base">Business date</Label>
+          <Input
+            type="date"
+            value={businessDate}
+            max={todayIso()}
+            onChange={(e) => setBusinessDate(e.target.value)}
+            className="h-12 text-base"
+          />
+        </div>
+      </div>
+
+      {previewLoading && <Skeleton className="h-40 w-full" />}
+
+      {previewError && (
+        <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{previewError}</div>
+      )}
+
+      {!previewLoading && preview && !report && (
+        <div className="flex flex-col gap-4 rounded-2xl border border-border bg-card p-5 shadow-[var(--shadow-panel)]">
+          {preview.alreadyClosed ? (
+            <div className="flex items-start gap-3 rounded-lg border border-success/30 bg-success/5 p-4 text-base text-success">
+              <CheckCircle2 className="size-5 shrink-0" />
+              <div>
+                <p className="font-semibold">{cashierName ?? `Cashier ${cashierUserId}`} already closed {businessDate}.</p>
+                <p className="text-sm text-success/80">{preview.slipCount} slip(s), {preview.bundleCount} bundle(s), {preview.grandTotal.toFixed(2)} total.</p>
+              </div>
+            </div>
+          ) : preview.draftSlipsBlockingClose.length > 0 || preview.draftBundleSalesBlockingClose.length > 0 ? (
+            <div className="flex items-start gap-3 rounded-lg border border-warning/30 bg-warning/5 p-4 text-base text-warning">
+              <AlertTriangle className="size-5 shrink-0" />
+              <div className="flex flex-col gap-2">
+                <p className="font-semibold">Still Draft — post or cancel these before closing.</p>
+                <ul className="list-inside list-disc text-sm">
+                  {preview.draftSlipsBlockingClose.map((s) => (
+                    <li key={`slip-${s.salesSlipId}`}>
+                      {s.slipNo} — {s.grandTotal.toFixed(2)}
+                    </li>
+                  ))}
+                  {preview.draftBundleSalesBlockingClose.map((b) => (
+                    <li key={`bundle-${b.bundleSaleId}`}>
+                      <Link href={`/dashboard/sales/bundles/${b.bundleSaleId}`} className="underline">{b.bundleNo}</Link> — {b.grandTotal.toFixed(2)}
+                    </li>
+                  ))}
+                </ul>
+              </div>
+            </div>
+          ) : (
+            <p className="text-base text-muted-foreground">
+              {preview.slipCount === 0 && preview.bundleCount === 0
+                ? "No sales slips or bundle sales for this cashier on this date."
+                : `${preview.slipCount} posted slip(s), ${preview.bundleCount} posted bundle sale(s) ready to close.`}
+            </p>
+          )}
+
+          <div className="grid grid-cols-2 gap-3 sm:grid-cols-4">
+            <Stat label="Subtotal" value={preview.subtotal} />
+            <Stat label="Discount" value={preview.discountTotal} />
+            <Stat label="Tax" value={preview.taxTotal} />
+            <Stat label="Grand total" value={preview.grandTotal} emphasize />
+          </div>
+
+          {!preview.alreadyClosed && (
+            <div className="flex justify-end">
+              <Button
+                size="lg"
+                onClick={handleClose}
+                disabled={closing || preview.draftSlipsBlockingClose.length > 0 || preview.draftBundleSalesBlockingClose.length > 0 || !cashierUserId}
+              >
+                <Lock className="size-5" />
+                {closing ? "Closing…" : "Close day"}
+              </Button>
+            </div>
+          )}
+
+          {preview.alreadyClosed && (
+            <div className="flex justify-end">
+              <Button size="lg" variant="outline" onClick={handleClose} disabled={closing}>
+                <ReceiptText className="size-5" />
+                {closing ? "Loading…" : "View full report"}
+              </Button>
+            </div>
+          )}
+        </div>
+      )}
+
+      {report && (
+        <div className="flex flex-col gap-4 rounded-2xl border border-border bg-card p-5 shadow-[var(--shadow-panel)]">
+          <div className="flex flex-col gap-1 border-b border-border pb-4 sm:flex-row sm:items-center sm:justify-between">
+            <div>
+              <h2 className="text-lg font-semibold text-foreground">{report.docNo}</h2>
+              <p className="text-sm text-muted-foreground">
+                {cashierName ?? `Cashier ${report.cashierUserId}`} — {report.businessDate} — closed {new Date(report.closedAt).toLocaleString()}
+              </p>
+            </div>
+            {report.glJournalNo && (
+              <div className="text-sm text-muted-foreground">
+                GL journal <span className="font-medium text-foreground">{report.glJournalNo}</span> posted {report.glPostedAt ? new Date(report.glPostedAt).toLocaleString() : ""}
+              </div>
+            )}
+          </div>
+
+          <div className="grid grid-cols-2 gap-3 sm:grid-cols-6">
+            <Stat label="Slips" value={report.slipCount} isCount />
+            <Stat label="Bundles" value={report.bundleCount} isCount />
+            <Stat label="Subtotal" value={report.subtotal} />
+            <Stat label="Discount" value={report.discountTotal} />
+            <Stat label="Tax" value={report.taxTotal} />
+            <Stat label="Grand total" value={report.grandTotal} emphasize />
+          </div>
+
+          <div className="flex flex-col gap-2">
+            <h3 className="text-sm font-semibold text-foreground">Item breakdown</h3>
+            <div className="overflow-x-auto">
+              <Table className="text-sm">
+                <TableHeader>
+                  <TableRow>
+                    <TableHead className="h-10 px-3 text-sm">Item</TableHead>
+                    <TableHead className="h-10 px-3 text-right text-sm">Qty</TableHead>
+                    <TableHead className="h-10 px-3 text-right text-sm">Revenue</TableHead>
+                  </TableRow>
+                </TableHeader>
+                <TableBody>
+                  {report.itemBreakdown.length === 0 ? (
+                    <TableRow>
+                      <TableCell colSpan={3} className="px-3 py-6 text-center text-sm text-muted-foreground">No lines.</TableCell>
+                    </TableRow>
+                  ) : (
+                    report.itemBreakdown.map((line) => (
+                      <TableRow key={line.itemId}>
+                        <TableCell className="px-3 py-2.5">{line.sku} — {line.name}</TableCell>
+                        <TableCell className="px-3 py-2.5 text-right font-mono tabular-nums">{line.qty}</TableCell>
+                        <TableCell className="px-3 py-2.5 text-right font-mono tabular-nums">{line.revenue.toFixed(2)}</TableCell>
+                      </TableRow>
+                    ))
+                  )}
+                </TableBody>
+              </Table>
+            </div>
+          </div>
+
+          {report.slipNumbers.length > 0 && (
+            <div className="flex flex-col gap-2">
+              <h3 className="text-sm font-semibold text-foreground">Slips included</h3>
+              <p className="text-sm text-muted-foreground">{report.slipNumbers.join(", ")}</p>
+            </div>
+          )}
+
+          {report.bundleNumbers.length > 0 && (
+            <div className="flex flex-col gap-2">
+              <h3 className="text-sm font-semibold text-foreground">Bundle sales included</h3>
+              <p className="text-sm text-muted-foreground">{report.bundleNumbers.join(", ")}</p>
+            </div>
+          )}
+        </div>
+      )}
+    </div>
+  )
+}
+
+function Stat({ label, value, emphasize, isCount }: { label: string; value: number; emphasize?: boolean; isCount?: boolean }) {
+  return (
+    <div className="flex flex-col gap-1 rounded-xl border border-border bg-muted/30 p-3">
+      <span className="text-xs text-muted-foreground">{label}</span>
+      <span className={cn("font-mono tabular-nums", emphasize ? "text-lg font-bold text-foreground" : "text-base font-semibold text-foreground")}>
+        {isCount ? value : value.toFixed(2)}
+      </span>
+    </div>
+  )
+}

Frontend/erp-system/app/dashboard/sales/free-issues/new/page.tsx

@@ -1,12 +1,12 @@
 "use client"
 
-import { useEffect, useState } from "react"
+import { useEffect, useMemo, useState } from "react"
 import Link from "next/link"
-import { ArrowLeft, Pencil, Plus, Save, Trash2, X } from "lucide-react"
+import { ArrowLeft, Eraser, Pencil, Plus, Save, Trash2, X } from "lucide-react"
 
 import { Button, buttonVariants } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
+import { Combobox } from "@/components/ui/combobox"
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
 import { cn } from "@/lib/utils"
 import { errorMessage } from "@/lib/error-map"
@@ -142,6 +142,15 @@ export default function NewFreeIssuePage() {
     setLines((prev) => (prev.length === 1 ? prev : prev.filter((line) => line.key !== key)))
   }
 
+  function clearAllLines() {
+    setLines([blankLine("line-1")])
+  }
+
+  const itemOptions = useMemo(
+    () => items.map((i) => ({ value: i.itemId, label: `${i.sku} - ${i.name}` })),
+    [items]
+  )
+
   function selectItem(key: string, itemId: number) {
     updateLine(key, { itemId })
   }
@@ -299,18 +308,12 @@ export default function NewFreeIssuePage() {
                   <TableRow key={line.key} className="align-middle">
                     <TableCell className="px-4 py-2 text-xs text-muted-foreground">{idx + 1}</TableCell>
                     <TableCell className="px-4 py-2 min-w-80">
-                      <Select value={line.itemId ? String(line.itemId) : ""} onValueChange={(v) => selectEditingItem(line.key, Number(v))}>
-                        <SelectTrigger className="h-9 text-sm">
-                          <SelectValue placeholder="Select item" />
-                        </SelectTrigger>
-                        <SelectContent>
-                          {items.map((candidate) => (
-                            <SelectItem key={candidate.itemId} value={String(candidate.itemId)}>
-                              {candidate.sku} - {candidate.name}
-                            </SelectItem>
-                          ))}
-                        </SelectContent>
-                      </Select>
+                      <Combobox
+                        items={itemOptions}
+                        value={line.itemId || null}
+                        onValueChange={(v) => selectEditingItem(line.key, v ?? 0)}
+                        placeholder="Search item…"
+                      />
                     </TableCell>
                     <TableCell className="px-4 py-2 min-w-44 text-sm text-muted-foreground">
                       {baseUomLabel(items, uoms, line.itemId)}
@@ -332,9 +335,20 @@ export default function NewFreeIssuePage() {
         <section className="rounded-2xl border border-border bg-card shadow-[var(--shadow-panel)]">
           <div className="flex items-center justify-between border-b border-border px-4 py-3">
             <h2 className="text-sm font-semibold">Free issue lines</h2>
-            <Button type="button" variant="outline" size="sm" onClick={addLine}>
-              <Plus className="size-4" /> Add line
-            </Button>
+            <div className="flex items-center gap-2">
+              <Button
+                type="button"
+                variant="outline"
+                size="sm"
+                onClick={clearAllLines}
+                disabled={lines.length === 1 && !lines[0].itemId}
+              >
+                <Eraser className="size-4" /> Clear all lines
+              </Button>
+              <Button type="button" variant="outline" size="sm" onClick={addLine}>
+                <Plus className="size-4" /> Add line
+              </Button>
+            </div>
           </div>
           <div className="overflow-x-auto">
             <Table className="text-sm">
@@ -353,18 +367,12 @@ export default function NewFreeIssuePage() {
                   <TableRow key={line.key} className="align-middle">
                     <TableCell className="px-4 py-2 text-xs text-muted-foreground">{idx + 1}</TableCell>
                     <TableCell className="px-4 py-2 min-w-80">
-                      <Select value={line.itemId ? String(line.itemId) : ""} onValueChange={(v) => selectItem(line.key, Number(v))}>
-                        <SelectTrigger className="h-9 text-sm">
-                          <SelectValue placeholder="Select item" />
-                        </SelectTrigger>
-                        <SelectContent>
-                          {items.map((candidate) => (
-                            <SelectItem key={candidate.itemId} value={String(candidate.itemId)}>
-                              {candidate.sku} - {candidate.name}
-                            </SelectItem>
-                          ))}
-                        </SelectContent>
-                      </Select>
+                      <Combobox
+                        items={itemOptions}
+                        value={line.itemId || null}
+                        onValueChange={(v) => selectItem(line.key, v ?? 0)}
+                        placeholder="Search item…"
+                      />
                     </TableCell>
                     <TableCell className="px-4 py-2 min-w-44">
                       {baseUomLabel(items, uoms, line.itemId)}
@@ -423,8 +431,8 @@ export default function NewFreeIssuePage() {
                       <div className="font-medium">{row.itemName}</div>
                       <div className="text-xs text-muted-foreground">{row.itemSku} · {row.uomName}</div>
                     </TableCell>
-                    <TableCell className="px-4 py-3.5 text-right font-mono tabular-nums">{row.qty}</TableCell>
-                    <TableCell className="px-4 py-3.5 text-right font-mono tabular-nums">{row.freeQty}</TableCell>
+                    <TableCell className="px-4 py-3.5 text-right tabular-nums">{row.qty}</TableCell>
+                    <TableCell className="px-4 py-3.5 text-right tabular-nums">{row.freeQty}</TableCell>
                     <TableCell className="px-4 py-3.5">
                       <div className="flex justify-end gap-1.5">
                         <button

Frontend/erp-system/app/dashboard/sales/invoices/[id]/page.tsx

@@ -16,9 +16,11 @@ import { cn } from "@/lib/utils"
 import { getSuggestedUnitPrice } from "@/lib/sales-line-utils"
 import { Customer } from "@/types/customers"
 import { ItemListItem, Uom, Warehouse } from "@/types/master-data"
-import { CreateSalesInvoiceLineRequest, SalesInvoice, SalesInvoicePostingCheck, SalesInvoiceStatus, SalesInvoiceType } from "@/types/sales"
+import { CreateSalesInvoiceLineRequest, SalesInvoice, SalesInvoicePayment, SalesInvoicePostingCheck, SalesInvoiceStatus, SalesInvoiceType } from "@/types/sales"
 import { toast } from "@/components/ui/toast"
 import { Label } from "@/components/ui/label"
+import { Button } from "@/components/ui/button"
+import { SalesInvoicePaymentDialog } from "@/components/sales/SalesInvoicePaymentDialog"
 
 type Line = CreateSalesInvoiceLineRequest & { key: string }
 
@@ -75,6 +77,8 @@ export default function SalesInvoiceDetailPage({ params }: { params: Promise<{ i
   const [error, setError] = useState<string | null>(null)
   const [saving, setSaving] = useState(false)
   const [busy, setBusy] = useState<"post" | "cancel" | null>(null)
+  const [payments, setPayments] = useState<SalesInvoicePayment[]>([])
+  const [payDialogOpen, setPayDialogOpen] = useState(false)
 
   useEffect(() => {
     if (!Number.isFinite(invoiceId)) {
@@ -132,6 +136,26 @@ export default function SalesInvoiceDetailPage({ params }: { params: Promise<{ i
       .catch(() => setPostingCheck(null))
   }, [invoice, invoiceId])
 
+  useEffect(() => {
+    if (!invoice || invoice.status !== "Posted") {
+      setPayments([])
+      return
+    }
+    salesApi.listInvoicePayments(invoiceId).then(setPayments).catch(() => setPayments([]))
+  }, [invoice, invoiceId])
+
+  function handlePaid(_updated: SalesInvoice, payment: SalesInvoicePayment) {
+    setInvoice((prev) =>
+      prev
+        ? {
+            ...prev,
+            totals: { ...prev.totals, paidAmount: prev.totals.paidAmount + payment.amount, balanceAmount: prev.totals.balanceAmount - payment.amount },
+          }
+        : prev
+    )
+    setPayments((prev) => [payment, ...prev])
+  }
+
   const isDraft = invoice?.status === "Draft"
   const customer = useMemo(() => customers.find((c) => c.customerId === invoice?.customerId), [customers, invoice?.customerId])
   const warehouse = useMemo(() => warehouses.find((w) => w.warehouseId === invoice?.warehouseId), [warehouses, invoice?.warehouseId])
@@ -608,18 +632,63 @@ export default function SalesInvoiceDetailPage({ params }: { params: Promise<{ i
             <div className="flex flex-col gap-3 rounded-2xl border border-dashed p-4 text-sm text-muted-foreground sm:flex-row sm:items-center sm:justify-between">
               <span>This invoice is {invoice.status.toLowerCase()} and cannot be edited.</span>
               {invoice.status === "Posted" ? (
-                <Link
-                  href={`/dashboard/sales/sales-returns/new?invoiceId=${invoice.salesInvoiceId}`}
-                  className="inline-flex h-9 items-center gap-2 self-start rounded-full border border-black bg-white px-4 text-sm font-medium text-foreground shadow-sm hover:bg-muted sm:self-auto"
-                >
-                  <Undo2 className="size-4" />
-                  Return items
-                </Link>
+                <div className="flex flex-wrap items-center gap-2">
+                  <Link
+                    href={`/dashboard/sales/sales-returns/new?invoiceId=${invoice.salesInvoiceId}`}
+                    className="inline-flex h-9 items-center gap-2 self-start rounded-full border border-black bg-white px-4 text-sm font-medium text-foreground shadow-sm hover:bg-muted sm:self-auto"
+                  >
+                    <Undo2 className="size-4" />
+                    Return items
+                  </Link>
+                  <Button size="sm" onClick={() => setPayDialogOpen(true)} disabled={invoice.totals.balanceAmount <= 0}>
+                    {invoice.totals.balanceAmount <= 0 ? "Fully paid" : "Record payment"}
+                  </Button>
+                </div>
               ) : null}
             </div>
           )}
+
+          {invoice.status === "Posted" && (
+            <div className="mt-5 flex flex-col gap-2 rounded-2xl border border-border p-4">
+              <div className="flex flex-wrap items-center justify-between gap-2 text-sm">
+                <span className="font-semibold text-foreground">Payment status</span>
+                <span className="text-muted-foreground">
+                  Paid {money.format(invoice.totals.paidAmount)} of {money.format(invoice.totals.netPayable)} — balance {money.format(invoice.totals.balanceAmount)}
+                  {invoice.glJournalNo ? ` · GL journal ${invoice.glJournalNo}` : ""}
+                </span>
+              </div>
+              {payments.length > 0 && (
+                <div className="overflow-x-auto">
+                  <table className="w-full text-sm">
+                    <thead className="text-left text-xs uppercase tracking-wide text-muted-foreground">
+                      <tr>
+                        <th className="py-1 pr-3">Date</th>
+                        <th className="py-1 pr-3">Account</th>
+                        <th className="py-1 pr-3">Reference</th>
+                        <th className="py-1 pr-3">GL journal</th>
+                        <th className="py-1 text-right">Amount</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      {payments.map((p) => (
+                        <tr key={p.salesInvoicePaymentId} className="border-t border-border">
+                          <td className="py-2 pr-3">{new Date(p.paymentDate).toLocaleString()}</td>
+                          <td className="py-2 pr-3">{p.bankAccountName}</td>
+                          <td className="py-2 pr-3">{p.reference ?? "—"}</td>
+                          <td className="py-2 pr-3">{p.glJournalNo ?? "—"}</td>
+                          <td className="py-2 text-right font-mono tabular-nums">{money.format(p.amount)}</td>
+                        </tr>
+                      ))}
+                    </tbody>
+                  </table>
+                </div>
+              )}
+            </div>
+          )}
         </div>
       </section>
+
+      <SalesInvoicePaymentDialog invoice={invoice} open={payDialogOpen} onOpenChange={setPayDialogOpen} onPaid={handlePaid} />
     </div>
   )
 }

Frontend/erp-system/app/dashboard/sales/invoices/new/page.tsx

@@ -230,7 +230,7 @@ export default function NewSalesInvoicePage() {
             <ArrowLeft className="size-4" />
           </Link>
           <div>
-            <h1 className="text-2xl font-bold text-foreground">New invoice</h1>
+            <h1 className="text-2xl font-bold text-foreground">New Sale</h1>
             <p className="text-base text-muted-foreground">Select items, set quantity, unit price and line discount.</p>
           </div>
         </div>

Frontend/erp-system/app/dashboard/sales/invoices/page.tsx

@@ -75,7 +75,7 @@ export default function SalesInvoicesPage() {
     <div className="flex flex-col gap-6">
       <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
         <div>
-          <h1 className="text-2xl font-bold text-foreground">Sales Invoices</h1>
+          <h1 className="text-2xl font-bold text-foreground">Sales</h1>
           <p className="text-base text-muted-foreground">Invoice register with filters, posting flow, and settlement tracking.</p>
         </div>
         <div className="flex flex-wrap gap-2">
@@ -90,7 +90,7 @@ export default function SalesInvoicesPage() {
           </Link>
           <Link href="/dashboard/sales/invoices/new" className={cn(buttonVariants({ size: "lg" }))}>
             <Plus className="size-5" />
-            New Invoice
+            New Sale
           </Link>
         </div>
       </div>
@@ -172,10 +172,10 @@ export default function SalesInvoicesPage() {
                       <TableCell className="px-4 py-3.5">{row.customerSnapshotName}</TableCell>
                       <TableCell className="px-4 py-3.5 text-muted-foreground">{new Date(row.createdAt).toLocaleDateString()}</TableCell>
                       <TableCell className="px-4 py-3.5 text-muted-foreground">{new Date(row.invoiceDate).toLocaleDateString()}</TableCell>
-                      <TableCell className="px-4 py-3.5 text-right font-mono tabular-nums">{row.totals.freeQtyTotal.toFixed(2)}</TableCell>
-                      <TableCell className="px-4 py-3.5 text-right font-mono tabular-nums">{row.totals.subtotal.toFixed(2)}</TableCell>
-                      <TableCell className="px-4 py-3.5 text-right font-mono tabular-nums text-muted-foreground">-{row.totals.discountTotal.toFixed(2)}</TableCell>
-                      <TableCell className="px-4 py-3.5 text-right font-mono font-semibold tabular-nums">{row.totals.grandTotal.toFixed(2)}</TableCell>
+                      <TableCell className="px-4 py-3.5 text-right tabular-nums">{row.totals.freeQtyTotal.toFixed(2)}</TableCell>
+                      <TableCell className="px-4 py-3.5 text-right tabular-nums">{row.totals.subtotal.toFixed(2)}</TableCell>
+                      <TableCell className="px-4 py-3.5 text-right tabular-nums text-muted-foreground">-{row.totals.discountTotal.toFixed(2)}</TableCell>
+                      <TableCell className="px-4 py-3.5 text-right font-semibold tabular-nums">{row.totals.grandTotal.toFixed(2)}</TableCell>
                       <TableCell className="px-4 py-3.5">
                         <Badge variant="outline" className={statusClass(row.status)}>
                           {row.status}
@@ -200,15 +200,15 @@ export default function SalesInvoicesPage() {
               <div className="grid gap-3 text-sm md:grid-cols-3">
                 <div className="rounded-lg border bg-muted/20 px-3 py-2">
                   <div className="text-muted-foreground">Gross total</div>
-                  <div className="font-mono text-base font-semibold tabular-nums">{grossTotal.toFixed(2)}</div>
+                  <div className="text-base font-semibold tabular-nums">{grossTotal.toFixed(2)}</div>
                 </div>
                 <div className="rounded-lg border bg-muted/20 px-3 py-2">
                   <div className="text-muted-foreground">Discount total</div>
-                  <div className="font-mono text-base font-semibold tabular-nums">-{discountTotal.toFixed(2)}</div>
+                  <div className="text-base font-semibold tabular-nums">-{discountTotal.toFixed(2)}</div>
                 </div>
                 <div className="rounded-lg border bg-muted/20 px-3 py-2">
                   <div className="text-muted-foreground">Net total</div>
-                  <div className="font-mono text-base font-semibold tabular-nums">{netTotal.toFixed(2)}</div>
+                  <div className="text-base font-semibold tabular-nums">{netTotal.toFixed(2)}</div>
                 </div>
               </div>
             </div>

Frontend/erp-system/app/dashboard/sales/page.tsx

@@ -1,5 +1,5 @@
 import Link from "next/link"
-import { FileBarChart, FileText, PackageX, ReceiptText, ShoppingCart } from "lucide-react"
+import { FileBarChart, FileText, Lock, PackageX, ReceiptText } from "lucide-react"
 
 import { buttonVariants } from "@/components/ui/button"
 import { cn } from "@/lib/utils"
@@ -11,18 +11,18 @@ const sections = [
     href: "/dashboard/sales/invoices",
     icon: FileText,
   },
-  {
-    title: "Slips",
-    description: "Counter-style sales documents.",
-    href: "/dashboard/sales/slips",
-    icon: ShoppingCart,
-  },
   {
     title: "Free Issues",
     description: "Promotional free-issue slips.",
     href: "/dashboard/sales/free-issues",
     icon: PackageX,
   },
+  {
+    title: "Day End",
+    description: "Close a cashier's day and post it to the ledger.",
+    href: "/dashboard/sales/day-end",
+    icon: Lock,
+  },
   // {
   //   title: "Reports",
   //   description: "Sales report catalog and query entry point.",

Frontend/erp-system/app/dashboard/sales/sales-returns/page.tsx

@@ -94,6 +94,7 @@ export default function SalesReturnsListPage() {
               <TableHead className="h-12 px-3 text-sm">Reason</TableHead>
               <TableHead className="h-12 px-3 text-right text-sm">Return Qty</TableHead>
               <TableHead className="h-12 px-3 text-sm">Status</TableHead>
+              <TableHead className="h-12 px-3 text-sm">GL Journal</TableHead>
               <TableHead className="h-12 px-3 text-sm">Created</TableHead>
             </TableRow>
           </TableHeader>
@@ -110,6 +111,7 @@ export default function SalesReturnsListPage() {
                     {r.status}
                   </Badge>
                 </TableCell>
+                <TableCell className="px-3 py-3.5 text-muted-foreground">{r.glJournalNo ?? "—"}</TableCell>
                 <TableCell className="px-3 py-3.5">{new Date(r.createdAt).toLocaleString()}</TableCell>
               </TableRow>
             ))}

Frontend/erp-system/app/dashboard/sales/slips/[id]/page.tsx

@@ -1,479 +0,0 @@
-"use client"
-
-import { use, useEffect, useMemo, useState } from "react"
-import Link from "next/link"
-import { ArrowLeft, ExternalLink, Minus, Plus, Printer, Save, Send, X } from "lucide-react"
-
-import { salesApi } from "@/lib/api/sales"
-import { customersApi } from "@/lib/api/customers"
-import { itemsApi } from "@/lib/api/items"
-import { uomsApi } from "@/lib/api/uoms"
-import { baseUomLabel } from "@/lib/uom-label"
-import { warehousesApi } from "@/lib/api/warehouses"
-import { usersApi } from "@/lib/api/users"
-import { errorMessage } from "@/lib/error-map"
-import { Button, buttonVariants } from "@/components/ui/button"
-import { Input } from "@/components/ui/input"
-import { Label } from "@/components/ui/label"
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
-import { Skeleton } from "@/components/ui/skeleton"
-import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
-import { cn } from "@/lib/utils"
-import { getSuggestedUnitPrice } from "@/lib/sales-line-utils"
-import { FreeIssuePromotionSuggestions } from "@/components/sales/FreeIssuePromotionSuggestions"
-import { Customer } from "@/types/customers"
-import { ItemListItem, Uom, Warehouse } from "@/types/master-data"
-import { ManagedUser } from "@/types/users"
-import { CreateSalesSlipLineRequest, SalesFreeIssueSuggestion, SalesSlip, SalesSlipPostingCheck } from "@/types/sales"
-import { toast } from "@/components/ui/toast"
-
-type Line = CreateSalesSlipLineRequest & { key: string }
-
-const money = new Intl.NumberFormat("en-LK", {
-  style: "currency",
-  currency: "LKR",
-  minimumFractionDigits: 2,
-})
-
-const blankLine = (key: string): Line => ({
-  key,
-  itemId: 0,
-  warehouseId: 0,
-  qty: 1,
-  freeQty: 0,
-  unitPrice: null,
-  allowManualPriceOverride: true,
-  discountMode: "Percentage",
-  discountPct: 0,
-  discountAmount: 0,
-  discountValue: 0,
-  taxPct: 0,
-  isFreeIssue: false,
-  parentLineId: null,
-})
-
-export default function SalesSlipDetailPage({ params }: { params: Promise<{ id: string }> }) {
-  const resolvedParams = use(params)
-  const slipId = Number(resolvedParams.id)
-  const [slip, setSlip] = useState<SalesSlip | null>(null)
-  const [etag, setEtag] = useState<string | null>(null)
-  const [customers, setCustomers] = useState<Customer[]>([])
-  const [items, setItems] = useState<ItemListItem[]>([])
-  const [uoms, setUoms] = useState<Uom[]>([])
-  const [warehouses, setWarehouses] = useState<Warehouse[]>([])
-  const [users, setUsers] = useState<ManagedUser[]>([])
-  const [promotionSuggestion, setPromotionSuggestion] = useState<SalesFreeIssueSuggestion | null>(null)
-  const [postingCheck, setPostingCheck] = useState<SalesSlipPostingCheck | null>(null)
-  const [customerId, setCustomerId] = useState<number | null>(null)
-  const [warehouseId, setWarehouseId] = useState<number | null>(null)
-  const [cashierUserId, setCashierUserId] = useState<number | null>(null)
-  const [lines, setLines] = useState<Line[]>([blankLine("line-1")])
-  const [error, setError] = useState<string | null>(null)
-  const [saving, setSaving] = useState(false)
-  const [actionBusy, setActionBusy] = useState<"post" | "cancel" | null>(null)
-
-  useEffect(() => {
-    if (!Number.isFinite(slipId)) {
-      setError(`Invalid slip id '${resolvedParams.id}'.`)
-      return
-    }
-    Promise.all([
-      customersApi.list({ pageSize: 200 }),
-      itemsApi.list({ pageSize: 200 }),
-      uomsApi.list({ pageSize: 200 }),
-      warehousesApi.list({ pageSize: 200 }),
-      usersApi.list({ pageSize: 200 }),
-      salesApi.getSlip(slipId),
-    ])
-      .then(([cust, itemRes, uomRes, whRes, userRes, doc]) => {
-        setCustomers(cust.items)
-        setItems(itemRes.items)
-        setUoms(uomRes.items)
-        setWarehouses(whRes.items)
-        setUsers(userRes.items)
-        setSlip(doc.data)
-        setEtag(doc.etag)
-        setCustomerId(doc.data.customerId)
-        setWarehouseId(doc.data.warehouseId)
-        setCashierUserId(doc.data.cashierUserId)
-        setPromotionSuggestion(null)
-        setLines(
-          doc.data.lines.map((line) => ({
-            key: String(line.salesSlipLineId),
-            itemId: line.itemId,
-            warehouseId: line.warehouseId,
-            qty: line.qty,
-            freeQty: line.freeQty,
-            unitPrice: line.unitPrice,
-            allowManualPriceOverride: true,
-            discountMode: line.discountMode,
-            discountPct: line.discountPct,
-            discountAmount: line.discountAmount,
-            discountValue: 0,
-            taxPct: line.taxPct,
-            isFreeIssue: line.isFreeIssue,
-            parentLineId: line.parentLineId,
-          }))
-        )
-      })
-      .then(async () => {
-        try {
-          const suggestions = await salesApi.getFreeIssueSuggestions(slipId)
-          setPromotionSuggestion(suggestions)
-        } catch {
-          setPromotionSuggestion(null)
-        }
-      })
-      .catch((err) => setError(errorMessage(err)))
-  }, [resolvedParams.id, slipId])
-
-  useEffect(() => {
-    if (!slip || slip.status !== "Draft") {
-      setPostingCheck(null)
-      return
-    }
-    salesApi
-      .checkSlipPosting(slipId)
-      .then((result) => setPostingCheck(result))
-      .catch(() => setPostingCheck(null))
-  }, [slip, slipId])
-
-  const subtotal = useMemo(
-    () => lines.reduce((sum, line) => sum + Number(line.qty || 0) * Number(line.unitPrice ?? 0), 0),
-    [lines]
-  )
-
-  function updateLine(key: string, patch: Partial<Line>) {
-    setLines((prev) => prev.map((line) => (line.key === key ? { ...line, ...patch } : line)))
-  }
-
-  function selectItem(key: string, itemId: number) {
-    updateLine(key, {
-      itemId,
-      unitPrice: getSuggestedUnitPrice(items, itemId),
-    })
-  }
-
-  function resolveLineUnitPrice(line: Line): number | null {
-    if (line.unitPrice !== null && line.unitPrice !== undefined) return Number(line.unitPrice)
-    return getSuggestedUnitPrice(items, line.itemId)
-  }
-
-  function addLine() {
-    setLines((prev) => [...prev, blankLine(`line-${Date.now()}`)])
-  }
-
-  function removeLine(key: string) {
-    setLines((prev) => (prev.length === 1 ? prev : prev.filter((line) => line.key !== key)))
-  }
-
-  async function save() {
-    if (!customerId || !warehouseId || !cashierUserId || !etag) return
-    setSaving(true)
-    setError(null)
-    try {
-      const payload = {
-        customerId,
-        warehouseId,
-        cashierUserId,
-          lines: lines.map((line) => ({
-            itemId: Number(line.itemId),
-            warehouseId: Number(line.warehouseId),
-            qty: Number(line.qty),
-            freeQty: Number(line.freeQty),
-            unitPrice: resolveLineUnitPrice(line),
-            allowManualPriceOverride: line.allowManualPriceOverride,
-          discountMode: line.discountMode,
-          discountPct: Number(line.discountPct),
-          discountAmount: Number(line.discountAmount),
-          discountValue: Number(line.discountValue),
-          taxPct: Number(line.taxPct),
-          isFreeIssue: line.isFreeIssue,
-          parentLineId: line.parentLineId || null,
-        })),
-      }
-      const updated = await salesApi.updateSlip(slipId, payload, etag)
-      setSlip(updated.data)
-      setEtag(updated.etag)
-      toast.success("Slip saved", updated.data.slipNo)
-    } catch (err) {
-      setError(errorMessage(err))
-    } finally {
-      setSaving(false)
-    }
-  }
-
-  async function post() {
-    if (!postingCheck?.canPost) {
-      setError("Resolve stock shortages before posting this slip.")
-      return
-    }
-    setActionBusy("post")
-    setError(null)
-    try {
-      const posted = await salesApi.postSlip(slipId)
-      setSlip(posted)
-      toast.success("Slip posted", posted.slipNo)
-    } catch (err) {
-      setError(errorMessage(err))
-    } finally {
-      setActionBusy(null)
-    }
-  }
-
-  async function cancel() {
-    setActionBusy("cancel")
-    setError(null)
-    try {
-      const cancelled = await salesApi.cancelSlip(slipId)
-      setSlip(cancelled)
-      toast.success("Slip cancelled", cancelled.slipNo)
-    } catch (err) {
-      setError(errorMessage(err))
-    } finally {
-      setActionBusy(null)
-    }
-  }
-
-  if (error && !slip) return <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>
-  if (!slip) return <div className="rounded-2xl border border-dashed p-8 text-muted-foreground">{error ?? "Slip data is loading or unavailable."}</div>
-
-  const locked = slip.status !== "Draft"
-  const canPost = slip.status === "Draft" && (postingCheck?.canPost ?? true) && actionBusy === null
-
-  return (
-    <div className="flex flex-col gap-6">
-      <div className="flex items-center justify-between gap-3">
-        <div className="flex items-center gap-3">
-          <Link href="/dashboard/sales/slips" className={cn(buttonVariants({ variant: "outline", size: "icon" }))}>
-            <ArrowLeft className="size-4" />
-          </Link>
-          <div>
-            <h1 className="text-2xl font-bold text-foreground">Sales Slip</h1>
-            <p className="text-base text-muted-foreground">{slip.slipNo} · {slip.status}</p>
-          </div>
-        </div>
-        <div className="flex flex-wrap gap-2">
-          <Link
-            href={`/print/sales/slips/${slip.salesSlipId}`}
-            target="_blank"
-            rel="noopener noreferrer"
-            className={cn(buttonVariants({ variant: "outline", size: "default" }))}
-          >
-            <Printer className="size-4" />
-            Print
-          </Link>
-          <Button variant="outline" onClick={save} disabled={saving || locked}><Save className="size-4" />{saving ? "Saving..." : "Save"}</Button>
-          <Button variant="outline" onClick={post} disabled={!canPost}><Send className="size-4" />{postingCheck && !postingCheck.canPost ? "Resolve shortages first" : actionBusy === "post" ? "Posting..." : "Post"}</Button>
-          <Button variant="destructive" onClick={cancel} disabled={actionBusy !== null || locked}><X className="size-4" />{actionBusy === "cancel" ? "Cancelling..." : "Cancel"}</Button>
-        </div>
-      </div>
-
-      {error && <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>}
-
-      <section className="bg-white">
-        <div className="border-b pb-4">
-          <div className="flex flex-col gap-3 md:flex-row md:items-start md:justify-between">
-            <div>
-              <div className="text-xs font-semibold uppercase tracking-[0.35em] text-muted-foreground">Sales Slip</div>
-              <h2 className="mt-2 text-3xl font-semibold text-foreground">{slip.slipNo}</h2>
-              <div className="mt-1 flex flex-wrap items-center gap-2 text-sm text-muted-foreground">
-                <span>Status:</span>
-                <span className={cn("inline-flex rounded-full border px-2 py-0.5 text-xs font-medium", slip.status === "Draft" ? "border-amber-200 bg-amber-50 text-amber-800" : slip.status === "Posted" ? "border-emerald-200 bg-emerald-50 text-emerald-800" : "border-rose-200 bg-rose-50 text-rose-800")}>
-                  {slip.status}
-                </span>
-                <span>Date: {new Date(slip.slipDate).toLocaleDateString()}</span>
-                <span>Cashier: {users.find((u) => u.userId === slip.cashierUserId)?.displayName ?? `#${slip.cashierUserId}`}</span>
-              </div>
-            </div>
-            <div className="text-sm md:text-right">
-              <div className="font-semibold text-foreground">{customers.find((c) => c.customerId === slip.customerId)?.displayName ?? customers.find((c) => c.customerId === slip.customerId)?.name ?? slip.customerSnapshotName}</div>
-              <div className="text-muted-foreground">Warehouse: {warehouses.find((w) => w.warehouseId === slip.warehouseId)?.name ?? `#${slip.warehouseId}`}</div>
-              <div className="text-muted-foreground">Code: {warehouses.find((w) => w.warehouseId === slip.warehouseId)?.code ?? slip.warehouseId}</div>
-            </div>
-          </div>
-        </div>
-
-        <div className="grid gap-6 py-5 md:grid-cols-3">
-          <div>
-            <div className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Customer</div>
-            <div className="mt-2 font-semibold text-foreground">{slip.customerSnapshotName}</div>
-            <div className="text-sm text-muted-foreground">Customer ID: {slip.customerId}</div>
-          </div>
-          <div>
-            <div className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Warehouse</div>
-            <div className="mt-2 font-semibold text-foreground">{warehouses.find((w) => w.warehouseId === slip.warehouseId)?.name ?? `#${slip.warehouseId}`}</div>
-            <div className="text-sm text-muted-foreground">Code: {warehouses.find((w) => w.warehouseId === slip.warehouseId)?.code ?? slip.warehouseId}</div>
-          </div>
-          <div>
-            <div className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Totals</div>
-            <div className="mt-2 grid grid-cols-2 gap-2 text-sm">
-              <div className="text-muted-foreground">Subtotal</div>
-              <div className="text-right font-medium">{money.format(slip.totals.subtotal)}</div>
-              <div className="text-muted-foreground">Discount</div>
-              <div className="text-right font-medium">{money.format(slip.totals.discountTotal)}</div>
-              <div className="text-muted-foreground">Free qty</div>
-              <div className="text-right font-medium">{slip.totals.freeQtyTotal.toFixed(0)}</div>
-              <div className="text-muted-foreground">Grand total</div>
-              <div className="text-right font-semibold">{money.format(slip.totals.grandTotal)}</div>
-            </div>
-          </div>
-        </div>
-
-        <div className="overflow-x-auto border-y">
-          <Table className="text-sm">
-            <TableHeader>
-              <TableRow>
-                <TableHead className="h-12 px-4 text-sm">Item</TableHead>
-                <TableHead className="h-12 px-4 text-sm">UOM</TableHead>
-                <TableHead className="h-12 px-4 text-sm text-right">Qty</TableHead>
-                <TableHead className="h-12 px-4 text-sm text-right">Free</TableHead>
-                <TableHead className="h-12 px-4 text-sm text-right">Unit price</TableHead>
-                <TableHead className="h-12 px-4 text-sm text-right">Line total</TableHead>
-              </TableRow>
-            </TableHeader>
-            <TableBody>
-              {slip.lines.map((line) => (
-                <TableRow key={line.salesSlipLineId}>
-                  <TableCell className="px-4 py-3">
-                    <div className="font-medium text-foreground">{line.description}</div>
-                    <div className="text-xs text-muted-foreground">SKU {items.find((i) => i.itemId === line.itemId)?.sku ?? `#${line.itemId}`}</div>
-                    <div className="mt-1 text-[11px] text-muted-foreground">
-                      {getSuggestedUnitPrice(items, line.itemId) !== null
-                        ? `Suggested: ${money.format(getSuggestedUnitPrice(items, line.itemId) ?? 0)}`
-                        : "No price suggestion available"}
-                    </div>
-                  </TableCell>
-                  <TableCell className="px-4 py-3">{baseUomLabel(items, uoms, line.itemId)}</TableCell>
-                  <TableCell className="px-4 py-3 text-right">{line.qty.toFixed(0)}</TableCell>
-                  <TableCell className="px-4 py-3 text-right">{line.freeQty > 0 ? line.freeQty.toFixed(0) : "-"}</TableCell>
-                  <TableCell className="px-4 py-3 text-right">{money.format(line.unitPrice)}</TableCell>
-                  <TableCell className="px-4 py-3 text-right font-medium">{money.format(line.lineTotal)}</TableCell>
-                </TableRow>
-              ))}
-            </TableBody>
-          </Table>
-        </div>
-      </section>
-
-      {slip.status === "Draft" && postingCheck && !postingCheck.canPost ? (
-        <div className="rounded-lg border border-amber-200 bg-amber-50 p-4 text-sm text-amber-900">
-          <div className="flex flex-col gap-3 md:flex-row md:items-start md:justify-between">
-            <div>
-              <div className="font-semibold">Stock shortage detected before posting</div>
-              <div className="mt-1">This slip cannot be posted until every line has enough available stock in the selected warehouse.</div>
-            </div>
-            <Link
-              href="/dashboard/receiving/grn/new"
-              className="inline-flex h-9 items-center gap-2 self-start rounded-full border border-amber-300 bg-white px-4 text-sm font-medium text-amber-950 shadow-sm hover:bg-amber-100"
-            >
-              <ExternalLink className="size-4" />
-              Create GRN
-            </Link>
-          </div>
-          <div className="mt-3 overflow-x-auto">
-            <table className="w-full text-sm">
-              <thead className="text-left text-xs uppercase tracking-wide text-amber-900/70">
-                <tr>
-                  <th className="py-1 pr-3">Item</th>
-                  <th className="py-1 pr-3">Warehouse</th>
-                  <th className="py-1 pr-3 text-right">Requested</th>
-                  <th className="py-1 pr-3 text-right">Available</th>
-                  <th className="py-1 text-right">Short</th>
-                </tr>
-              </thead>
-              <tbody>
-                {postingCheck.issues.map((issue) => (
-                  <tr key={issue.salesSlipLineId} className="border-t border-amber-200/60">
-                    <td className="py-2 pr-3">
-                      <div className="font-medium">{issue.itemSku}</div>
-                      <div className="text-xs text-amber-900/70">{issue.itemName}{issue.isFreeIssue ? " · free issue" : ""}</div>
-                    </td>
-                    <td className="py-2 pr-3">{issue.warehouseId}</td>
-                    <td className="py-2 pr-3 text-right font-mono tabular-nums">{issue.requestedQty.toFixed(0)}</td>
-                    <td className="py-2 pr-3 text-right font-mono tabular-nums">{issue.availableQty.toFixed(0)}</td>
-                    <td className="py-2 text-right font-mono tabular-nums">{issue.shortQty.toFixed(0)}</td>
-                  </tr>
-                ))}
-              </tbody>
-            </table>
-          </div>
-        </div>
-      ) : null}
-
-      {slip.status === "Draft" ? (
-        <>
-          <div className="grid gap-4 md:grid-cols-3">
-            <div className="flex flex-col gap-2">
-              <Label>Customer</Label>
-              <Select value={customerId ? String(customerId) : ""} onValueChange={(v) => setCustomerId(v ? Number(v) : null)} disabled={locked}>
-                <SelectTrigger className="h-12!"><SelectValue /></SelectTrigger>
-                <SelectContent>{customers.map((c) => <SelectItem key={c.customerId} value={String(c.customerId)}>{c.customerCode} - {c.displayName ?? c.name}</SelectItem>)}</SelectContent>
-              </Select>
-            </div>
-            <div className="flex flex-col gap-2">
-              <Label>Warehouse</Label>
-              <Select value={warehouseId ? String(warehouseId) : ""} onValueChange={(v) => setWarehouseId(v ? Number(v) : null)} disabled={locked}>
-                <SelectTrigger className="h-12!"><SelectValue /></SelectTrigger>
-                <SelectContent>{warehouses.map((w) => <SelectItem key={w.warehouseId} value={String(w.warehouseId)}>{w.code} - {w.name}</SelectItem>)}</SelectContent>
-              </Select>
-            </div>
-            <div className="flex flex-col gap-2">
-              <Label>Cashier</Label>
-              <Select value={cashierUserId ? String(cashierUserId) : ""} onValueChange={(v) => setCashierUserId(v ? Number(v) : null)} disabled={locked}>
-                <SelectTrigger className="h-12!"><SelectValue /></SelectTrigger>
-                <SelectContent>{users.map((u) => <SelectItem key={u.userId} value={String(u.userId)}>{u.displayName}</SelectItem>)}</SelectContent>
-              </Select>
-            </div>
-          </div>
-
-          <div className="rounded-2xl border p-4">
-            <div className="mb-3 flex items-center justify-between">
-              <h2 className="text-lg font-semibold">Lines</h2>
-              <Button type="button" variant="outline" onClick={addLine} disabled={locked}><Plus className="size-4" /> Add line</Button>
-            </div>
-            <Table>
-              <TableHeader>
-                <TableRow>
-                  <TableHead>Item</TableHead>
-                  <TableHead>UOM</TableHead>
-                  <TableHead>Qty</TableHead>
-                  <TableHead>Free</TableHead>
-                  <TableHead>Unit price</TableHead>
-                  <TableHead />
-                </TableRow>
-              </TableHeader>
-              <TableBody>
-                {lines.map((line) => (
-                  <TableRow key={line.key}>
-                    <TableCell>
-                      <Select value={line.itemId ? String(line.itemId) : ""} onValueChange={(v) => selectItem(line.key, Number(v))} disabled={locked}>
-                        <SelectTrigger className="h-11!"><SelectValue placeholder="Item" /></SelectTrigger>
-                        <SelectContent>{items.map((i) => <SelectItem key={i.itemId} value={String(i.itemId)}>{i.sku} - {i.name}</SelectItem>)}</SelectContent>
-                      </Select>
-                    </TableCell>
-                    <TableCell className="text-sm text-muted-foreground">{baseUomLabel(items, uoms, line.itemId)}</TableCell>
-                    <TableCell><Input type="number" min="0" step="0.01" value={line.qty} onChange={(e) => updateLine(line.key, { qty: Number(e.target.value) })} disabled={locked} /></TableCell>
-                    <TableCell><Input type="number" min="0" step="0.01" value={line.freeQty} onChange={(e) => updateLine(line.key, { freeQty: Number(e.target.value) })} disabled={locked} /></TableCell>
-                    <TableCell><Input type="number" min="0" step="0.01" value={line.unitPrice ?? ""} onChange={(e) => updateLine(line.key, { unitPrice: e.target.value === "" ? null : Number(e.target.value) })} disabled={locked} /></TableCell>
-                    <TableCell><Button type="button" variant="ghost" size="icon" onClick={() => removeLine(line.key)} disabled={locked}><Minus className="size-4" /></Button></TableCell>
-                  </TableRow>
-                ))}
-              </TableBody>
-            </Table>
-            <div className="mt-4 text-sm text-muted-foreground">Subtotal: {subtotal.toFixed(2)}</div>
-          </div>
-
-          <FreeIssuePromotionSuggestions suggestion={promotionSuggestion} />
-
-          <div className="flex justify-end gap-3">
-            <Link href="/dashboard/sales/slips" className={cn(buttonVariants({ variant: "outline", size: "lg" }))}>Back</Link>
-            <Button variant="outline" onClick={save} disabled={saving || locked}>Save</Button>
-            <Button onClick={post} disabled={!canPost}>Post</Button>
-          </div>
-        </>
-      ) : null}
-    </div>
-  )
-}
-

Frontend/erp-system/app/dashboard/sales/slips/new/page.tsx

@@ -1,435 +0,0 @@
-"use client"
-
-import { useEffect, useMemo, useState } from "react"
-import { useRouter } from "next/navigation"
-import Link from "next/link"
-import { ArrowLeft, Minus, Plus, Save, Trash2 } from "lucide-react"
-
-import { Button, buttonVariants } from "@/components/ui/button"
-import { Input } from "@/components/ui/input"
-import { Label } from "@/components/ui/label"
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
-import { Badge } from "@/components/ui/badge"
-import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
-import { cn } from "@/lib/utils"
-import { getSuggestedUnitPrice } from "@/lib/sales-line-utils"
-import { errorMessage } from "@/lib/error-map"
-import { salesApi } from "@/lib/api/sales"
-import { customersApi } from "@/lib/api/customers"
-import { itemsApi } from "@/lib/api/items"
-import { uomsApi } from "@/lib/api/uoms"
-import { baseUomLabel } from "@/lib/uom-label"
-import { warehousesApi } from "@/lib/api/warehouses"
-import { usersApi } from "@/lib/api/users"
-import { Customer } from "@/types/customers"
-import { ItemListItem, Uom, Warehouse } from "@/types/master-data"
-import { ManagedUser } from "@/types/users"
-import { CreateSalesSlipLineRequest, CreateSalesSlipRequest } from "@/types/sales"
-import { toast } from "@/components/ui/toast"
-
-type Line = CreateSalesSlipLineRequest & { key: string }
-
-const blankLine = (key: string): Line => ({
-  key,
-  itemId: 0,
-  warehouseId: 0,
-  qty: 1,
-  freeQty: 0,
-  unitPrice: null,
-  allowManualPriceOverride: true,
-  discountMode: "Percentage",
-  discountPct: 0,
-  discountAmount: 0,
-  discountValue: 0,
-  taxPct: 0,
-  isFreeIssue: false,
-  parentLineId: null,
-})
-
-const lkr = new Intl.NumberFormat("en-LK", {
-  style: "currency",
-  currency: "LKR",
-  minimumFractionDigits: 2,
-})
-
-export default function NewSalesSlipPage() {
-  const router = useRouter()
-  const [customers, setCustomers] = useState<Customer[]>([])
-  const [items, setItems] = useState<ItemListItem[]>([])
-  const [uoms, setUoms] = useState<Uom[]>([])
-  const [warehouses, setWarehouses] = useState<Warehouse[]>([])
-  const [users, setUsers] = useState<ManagedUser[]>([])
-  const [customerId, setCustomerId] = useState<number | null>(null)
-  const [warehouseId, setWarehouseId] = useState<number | null>(null)
-  const [cashierUserId, setCashierUserId] = useState<number | null>(null)
-  const [lines, setLines] = useState<Line[]>([blankLine("line-1")])
-  const [loading, setLoading] = useState(true)
-  const [submitError, setSubmitError] = useState<string | null>(null)
-  const [saving, setSaving] = useState(false)
-
-  useEffect(() => {
-    Promise.all([
-      customersApi.list({ pageSize: 200 }),
-      itemsApi.list({ pageSize: 200 }),
-      uomsApi.list({ pageSize: 200 }),
-      warehousesApi.list({ pageSize: 200 }),
-      usersApi.list({ pageSize: 200 }),
-    ])
-      .then(([cust, itemRes, uomRes, whRes, userRes]) => {
-        setCustomers(cust.items)
-        setItems(itemRes.items)
-        setUoms(uomRes.items)
-        setWarehouses(whRes.items)
-        setUsers(userRes.items)
-        setCustomerId(cust.items[0]?.customerId ?? null)
-        setWarehouseId(whRes.items[0]?.warehouseId ?? null)
-        setCashierUserId(userRes.items[0]?.userId ?? null)
-        setLines([
-          {
-            ...blankLine("line-1"),
-            itemId: itemRes.items[0]?.itemId ?? 0,
-            warehouseId: whRes.items[0]?.warehouseId ?? 0,
-            unitPrice: getSuggestedUnitPrice(itemRes.items, itemRes.items[0]?.itemId),
-          },
-        ])
-      })
-      .catch((err) => setSubmitError(errorMessage(err)))
-      .finally(() => setLoading(false))
-  }, [])
-
-  function updateLine(key: string, patch: Partial<Line>) {
-    setLines((prev) => prev.map((line) => (line.key === key ? { ...line, ...patch } : line)))
-  }
-
-  function selectItem(key: string, itemId: number) {
-    const item = items.find((candidate) => candidate.itemId === itemId)
-    updateLine(key, {
-      itemId,
-      unitPrice: getSuggestedUnitPrice(items, itemId),
-    })
-  }
-
-  function resolveLineUnitPrice(line: Line): number | null {
-    if (line.unitPrice !== null && line.unitPrice !== undefined) return Number(line.unitPrice)
-    return getSuggestedUnitPrice(items, line.itemId)
-  }
-
-  function addLine() {
-    setLines((prev) => [...prev, blankLine(`line-${Date.now()}`)])
-  }
-
-  function removeLine(key: string) {
-    setLines((prev) => (prev.length === 1 ? prev : prev.filter((line) => line.key !== key)))
-  }
-
-  const grossTotal = useMemo(
-    () => lines.reduce((sum, line) => sum + Number(line.unitPrice ?? 0) * Number(line.qty || 0), 0),
-    [lines],
-  )
-  const discountTotal = useMemo(
-    () =>
-      lines.reduce((sum, line) => {
-        const gross = Number(line.unitPrice ?? 0) * Number(line.qty || 0)
-        const mode = String(line.discountMode)
-        return sum + (mode === "Amount" ? Number(line.discountAmount || 0) : gross * (Number(line.discountPct || 0) / 100))
-      }, 0),
-    [lines],
-  )
-  const taxTotal = useMemo(
-    () =>
-      lines.reduce((sum, line) => {
-        const gross = Number(line.unitPrice ?? 0) * Number(line.qty || 0)
-        const mode = String(line.discountMode)
-        const discount = mode === "Amount" ? Number(line.discountAmount || 0) : gross * (Number(line.discountPct || 0) / 100)
-        const taxable = Math.max(0, gross - discount)
-        return sum + taxable * (Number(line.taxPct || 0) / 100)
-      }, 0),
-    [lines],
-  )
-  const netTotal = Math.max(0, grossTotal - discountTotal)
-  const payableTotal = netTotal + taxTotal
-
-  async function submit() {
-    if (!customerId || !warehouseId || !cashierUserId) return setSubmitError("Select customer, warehouse, and cashier.")
-    if (lines.some((line) => Number(line.itemId) === 0)) return setSubmitError("Select an item for every line.")
-    if (lines.some((line) => Number(line.warehouseId) === 0)) return setSubmitError("Select a warehouse for every line.")
-
-    const payload: CreateSalesSlipRequest = {
-      customerId,
-      warehouseId,
-      cashierUserId,
-      lines: lines.map((line) => ({
-        itemId: Number(line.itemId),
-        warehouseId: Number(line.warehouseId),
-        qty: Number(line.qty),
-        freeQty: Number(line.freeQty),
-        unitPrice: resolveLineUnitPrice(line),
-        allowManualPriceOverride: line.allowManualPriceOverride,
-        discountMode: line.discountMode,
-        discountPct: Number(line.discountPct),
-        discountAmount: Number(line.discountAmount),
-        discountValue: Number(line.discountValue),
-        taxPct: Number(line.taxPct),
-        isFreeIssue: line.isFreeIssue,
-        parentLineId: line.parentLineId || null,
-      })),
-    }
-
-    setSaving(true)
-    setSubmitError(null)
-    try {
-      const created = await salesApi.createSlip(payload)
-      toast.success("Slip created", created.data.slipNo)
-      router.push(`/dashboard/sales/slips/${created.data.salesSlipId}`)
-    } catch (err) {
-      setSubmitError(errorMessage(err))
-    } finally {
-      setSaving(false)
-    }
-  }
-
-  if (loading) {
-    return <div className="rounded-2xl border border-border bg-card p-8 text-muted-foreground shadow-[var(--shadow-panel)]">Loading masters...</div>
-  }
-
-  return (
-    <div className="flex flex-col gap-6">
-      <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
-        <div className="flex items-center gap-3">
-          <Link href="/dashboard/sales/slips" className={cn(buttonVariants({ variant: "outline", size: "icon" }))}>
-            <ArrowLeft className="size-4" />
-          </Link>
-          <div>
-            <h1 className="text-2xl font-bold text-foreground">New sales slip</h1>
-            <p className="text-base text-muted-foreground">Create counter sales slips from the live backend.</p>
-          </div>
-        </div>
-        <div className="flex flex-wrap gap-2">
-          <Button type="button" variant="outline" size="sm" onClick={addLine}>
-            <Plus className="size-4" /> Add line
-          </Button>
-          <Button size="sm" onClick={submit} disabled={saving}>
-            <Save className="size-4" /> {saving ? "Saving..." : "Save slip"}
-          </Button>
-        </div>
-      </div>
-
-      {submitError ? <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{submitError}</div> : null}
-
-      <section className="rounded-2xl border border-border bg-card p-4 shadow-[var(--shadow-panel)]">
-        <h2 className="text-sm font-semibold">Slip header</h2>
-        <div className="mt-3 grid gap-4 sm:grid-cols-2 lg:grid-cols-4">
-          <div className="space-y-1.5">
-            <Label className="text-xs">Customer</Label>
-            <Select value={customerId ? String(customerId) : ""} onValueChange={(v) => setCustomerId(v ? Number(v) : null)}>
-              <SelectTrigger className="h-9 text-sm">
-                <SelectValue placeholder="Select customer" />
-              </SelectTrigger>
-              <SelectContent>
-                {customers.map((c) => (
-                  <SelectItem key={c.customerId} value={String(c.customerId)}>
-                    {c.customerCode} - {c.displayName ?? c.name}
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
-          </div>
-          <div className="space-y-1.5">
-            <Label className="text-xs">Warehouse</Label>
-            <Select value={warehouseId ? String(warehouseId) : ""} onValueChange={(v) => setWarehouseId(v ? Number(v) : null)}>
-              <SelectTrigger className="h-9 text-sm">
-                <SelectValue placeholder="Select warehouse" />
-              </SelectTrigger>
-              <SelectContent>
-                {warehouses.map((w) => (
-                  <SelectItem key={w.warehouseId} value={String(w.warehouseId)}>
-                    {w.code} - {w.name}
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
-          </div>
-          <div className="space-y-1.5">
-            <Label className="text-xs">Cashier</Label>
-            <Select value={cashierUserId ? String(cashierUserId) : ""} onValueChange={(v) => setCashierUserId(v ? Number(v) : null)}>
-              <SelectTrigger className="h-9 text-sm">
-                <SelectValue placeholder="Select cashier" />
-              </SelectTrigger>
-              <SelectContent>
-                {users.map((u) => (
-                  <SelectItem key={u.userId} value={String(u.userId)}>
-                    {u.displayName}
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
-          </div>
-          <div className="space-y-1.5">
-            <Label className="text-xs">Slip summary</Label>
-            <div className="flex h-9 items-center gap-2 rounded-md border border-border bg-secondary/40 px-3 text-xs text-muted-foreground">
-              <Badge variant="outline" className="border-emerald-200 bg-emerald-50 text-emerald-800">
-                Draft
-              </Badge>
-              <span>{lkr.format(payableTotal)}</span>
-            </div>
-          </div>
-        </div>
-      </section>
-
-      <section className="rounded-2xl border border-border bg-card shadow-[var(--shadow-panel)]">
-        <div className="flex items-center justify-between border-b border-border px-4 py-3">
-          <h2 className="text-sm font-semibold">Slip lines</h2>
-          <Button type="button" variant="outline" size="sm" onClick={addLine}>
-            <Plus className="size-4" /> Add line
-          </Button>
-        </div>
-        <div className="overflow-x-auto">
-          <Table className="text-sm">
-            <TableHeader>
-              <TableRow>
-                <TableHead className="h-12 px-4 text-sm">#</TableHead>
-                <TableHead className="h-12 px-4 text-sm">Item</TableHead>
-                <TableHead className="h-12 px-4 text-sm">UOM</TableHead>
-                <TableHead className="h-12 px-4 text-sm text-right">Qty</TableHead>
-                <TableHead className="h-12 px-4 text-sm text-right">Free</TableHead>
-                <TableHead className="h-12 px-4 text-sm text-right">Unit price</TableHead>
-                <TableHead className="h-12 px-4 text-sm text-right">Discount %</TableHead>
-                <TableHead className="h-12 px-4 text-sm text-right">Line total</TableHead>
-                <TableHead className="h-12 px-4 text-sm" />
-              </TableRow>
-            </TableHeader>
-            <TableBody>
-              {lines.map((line, idx) => {
-                const lineGross = Number(line.unitPrice ?? 0) * Number(line.qty || 0)
-                const lineDiscount =
-                  String(line.discountMode) === "Amount"
-                    ? Number(line.discountAmount || 0)
-                    : lineGross * (Number(line.discountPct || 0) / 100)
-                const lineNet = Math.max(0, lineGross - lineDiscount)
-
-                return (
-                  <TableRow key={line.key} className="align-middle">
-                    <TableCell className="px-4 py-2 text-xs text-muted-foreground">{idx + 1}</TableCell>
-                    <TableCell className="px-4 py-2 min-w-64">
-                      <Select value={line.itemId ? String(line.itemId) : ""} onValueChange={(v) => selectItem(line.key, Number(v))}>
-                        <SelectTrigger className="h-9 text-sm">
-                          <SelectValue placeholder="Select item" />
-                        </SelectTrigger>
-                        <SelectContent>
-                          {items.map((candidate) => (
-                            <SelectItem key={candidate.itemId} value={String(candidate.itemId)}>
-                              {candidate.sku} - {candidate.name}
-                            </SelectItem>
-                          ))}
-                        </SelectContent>
-                      </Select>
-                    </TableCell>
-                    <TableCell className="px-4 py-2 min-w-36 text-sm text-muted-foreground">
-                      {baseUomLabel(items, uoms, line.itemId)}
-                    </TableCell>
-                    <TableCell className="px-4 py-2">
-                      <Input
-                        type="number"
-                        min="0"
-                        step="0.01"
-                        value={line.qty}
-                        onChange={(e) => updateLine(line.key, { qty: Number(e.target.value) })}
-                        className="h-9 w-24 text-right font-mono text-sm tabular-nums"
-                      />
-                    </TableCell>
-                    <TableCell className="px-4 py-2">
-                      <Input
-                        type="number"
-                        min="0"
-                        step="0.01"
-                        value={line.freeQty}
-                        onChange={(e) => updateLine(line.key, { freeQty: Number(e.target.value) })}
-                        className="h-9 w-24 text-right font-mono text-sm tabular-nums"
-                      />
-                    </TableCell>
-                    <TableCell className="px-4 py-2">
-                      <Input
-                        type="number"
-                        min="0"
-                        step="0.01"
-                        value={line.unitPrice ?? ""}
-                        onChange={(e) => updateLine(line.key, { unitPrice: e.target.value === "" ? null : Number(e.target.value) })}
-                        className="h-9 w-28 text-right font-mono text-sm tabular-nums"
-                      />
-                      <div className="mt-1 text-[11px] text-muted-foreground">
-                        {getSuggestedUnitPrice(items, line.itemId) !== null
-                          ? `Suggested: ${lkr.format(getSuggestedUnitPrice(items, line.itemId) ?? 0)}`
-                          : "No price suggestion available"}
-                      </div>
-                    </TableCell>
-                    <TableCell className="px-4 py-2">
-                      <Input
-                        type="number"
-                        min="0"
-                        max="100"
-                        step="0.5"
-                        value={line.discountPct}
-                        onChange={(e) => updateLine(line.key, { discountPct: Number(e.target.value) || 0 })}
-                        className="h-9 w-24 text-right font-mono text-sm tabular-nums"
-                      />
-                    </TableCell>
-                    <TableCell className="px-4 py-2 text-right font-mono font-semibold tabular-nums">{lkr.format(lineNet)}</TableCell>
-                    <TableCell className="px-4 py-2 text-right">
-                      <Button
-                        variant="ghost"
-                        size="icon"
-                        className="size-8 text-muted-foreground"
-                        onClick={() => removeLine(line.key)}
-                        disabled={lines.length === 1}
-                      >
-                        <Trash2 className="size-4" />
-                      </Button>
-                    </TableCell>
-                  </TableRow>
-                )
-              })}
-            </TableBody>
-          </Table>
-        </div>
-      </section>
-
-      <section className="grid gap-4 md:grid-cols-2">
-        <div className="rounded-2xl border border-border bg-card p-4 shadow-[var(--shadow-panel)]">
-          <h3 className="text-sm font-semibold">Slip notes</h3>
-          <ul className="mt-3 space-y-2 text-sm text-muted-foreground">
-            <li className="rounded-md border border-border px-3 py-2">Cashier posting follows the standard sales-slip workflow.</li>
-            <li className="rounded-md border border-border px-3 py-2">Free issue lines are captured from the slip itself, not from a separate register here.</li>
-            <li className="rounded-md border border-border px-3 py-2">Use the slip detail page after save to post or cancel.</li>
-          </ul>
-        </div>
-
-        <dl className="rounded-2xl border border-border bg-card p-4 text-sm shadow-[var(--shadow-panel)]">
-          {[
-            ["Gross", lkr.format(grossTotal)],
-            ["Discount", `-${lkr.format(discountTotal)}`],
-            ["Net", lkr.format(netTotal)],
-            ["Tax", lkr.format(taxTotal)],
-          ].map(([k, v]) => (
-            <div key={k} className="flex items-center justify-between py-1.5">
-              <dt className="text-muted-foreground">{k}</dt>
-              <dd className="font-mono tabular-nums">{v}</dd>
-            </div>
-          ))}
-          <div className="mt-2 flex items-center justify-between border-t border-border pt-3">
-            <dt className="font-semibold">Payable</dt>
-            <dd className="font-mono text-base font-semibold tabular-nums">{lkr.format(payableTotal)}</dd>
-          </div>
-        </dl>
-      </section>
-
-      <div className="flex justify-end gap-3">
-        <Link href="/dashboard/sales/slips" className={cn(buttonVariants({ variant: "outline", size: "lg" }))}>
-          Cancel
-        </Link>
-        <Button size="lg" onClick={submit} disabled={saving}>
-          {saving ? "Saving..." : "Create slip"}
-        </Button>
-      </div>
-    </div>
-  )
-}

Frontend/erp-system/app/dashboard/sales/slips/page.tsx

@@ -1,235 +0,0 @@
-"use client"
-
-import { useEffect, useMemo, useState } from "react"
-import Link from "next/link"
-import { ChevronLeft, ChevronRight, Eye, Filter, Package2, Plus, Printer } from "lucide-react"
-
-import { salesApi } from "@/lib/api/sales"
-import { errorMessage } from "@/lib/error-map"
-import { Button, buttonVariants } from "@/components/ui/button"
-import { Badge } from "@/components/ui/badge"
-import { Input } from "@/components/ui/input"
-import { Skeleton } from "@/components/ui/skeleton"
-import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
-import { cn } from "@/lib/utils"
-import { PaginationMeta } from "@/types/common"
-import { SalesSlipStatus, SalesSlipSummary } from "@/types/sales"
-
-type StatusFilter = SalesSlipStatus | "All"
-
-const PAGE_SIZE = 10
-const tabs = ["All", "Draft", "Posted", "Cancelled"] as const
-
-function statusClass(status: SalesSlipStatus) {
-  switch (status) {
-    case "Draft":
-      return "border-amber-200 bg-amber-50 text-amber-800"
-    case "Posted":
-      return "border-emerald-200 bg-emerald-50 text-emerald-800"
-    case "Cancelled":
-      return "border-rose-200 bg-rose-50 text-rose-800"
-  }
-}
-
-export default function SalesSlipsPage() {
-  const [rows, setRows] = useState<SalesSlipSummary[] | null>(null)
-  const [pagination, setPagination] = useState<PaginationMeta | null>(null)
-  const [error, setError] = useState<string | null>(null)
-  const [status, setStatus] = useState<StatusFilter>("All")
-  const [searchInput, setSearchInput] = useState("")
-  const [query, setQuery] = useState("")
-  const [page, setPage] = useState(1)
-
-  useEffect(() => {
-    const timeout = setTimeout(() => setQuery(searchInput.trim()), 300)
-    return () => clearTimeout(timeout)
-  }, [searchInput])
-
-  useEffect(() => setPage(1), [query, status])
-
-  useEffect(() => {
-    setError(null)
-    salesApi
-      .listSlips({ page, pageSize: PAGE_SIZE, status: status === "All" ? undefined : status })
-      .then((res) => {
-        setRows(res.items)
-        setPagination(res.pagination)
-      })
-      .catch((err) => setError(errorMessage(err)))
-  }, [page, status])
-
-  const visibleRows = useMemo(
-    () =>
-      rows?.filter((row) =>
-        `${row.slipNo} ${row.customerSnapshotName}`.toLowerCase().includes(query.toLowerCase())
-      ) ?? [],
-    [rows, query]
-  )
-  const hasFilters = status !== "All" || query.length > 0
-  const grossTotal = visibleRows.reduce((sum, row) => sum + row.totals.subtotal, 0)
-  const discountTotal = visibleRows.reduce((sum, row) => sum + row.totals.discountTotal, 0)
-  const netTotal = visibleRows.reduce((sum, row) => sum + row.totals.grandTotal, 0)
-  const printHref = `/print/sales/slips?status=${encodeURIComponent(status)}&q=${encodeURIComponent(query)}`
-
-  return (
-    <div className="flex flex-col gap-6">
-      <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
-        <div>
-          <h1 className="text-2xl font-bold text-foreground">Sales Slips</h1>
-          <p className="text-base text-muted-foreground">Counter sales register with posting and cancellation flow.</p>
-        </div>
-        <div className="flex flex-wrap gap-2">
-          <Link
-            href={printHref}
-            target="_blank"
-            rel="noopener noreferrer"
-            className={cn(buttonVariants({ variant: "outline", size: "lg" }))}
-          >
-            <Printer className="size-5" />
-            Print batch
-          </Link>
-          <Link href="/dashboard/sales/slips/new" className={cn(buttonVariants({ size: "lg" }))}>
-            <Plus className="size-5" />
-            New Slip
-          </Link>
-        </div>
-      </div>
-
-      <div className="rounded-2xl border bg-card shadow-sm">
-        <div className="flex flex-col gap-3 border-b px-4 py-4 lg:flex-row lg:items-center">
-          <div className="flex flex-wrap gap-2">
-            {tabs.map((t) => (
-              <button
-                key={t}
-                onClick={() => setStatus(t)}
-                className={cn(
-                  "rounded-full border px-3 py-1.5 text-xs font-medium transition-colors",
-                  status === t ? "border-primary bg-primary text-primary-foreground" : "border-border text-muted-foreground hover:text-foreground"
-                )}
-              >
-                {t}
-              </button>
-            ))}
-          </div>
-
-          <div className="flex flex-1 flex-col gap-3 lg:flex-row lg:items-center lg:justify-end">
-            <Input
-              value={searchInput}
-              onChange={(e) => setSearchInput(e.target.value)}
-              placeholder="Filter by customer or slip number"
-              className="h-12 w-full lg:max-w-sm"
-            />
-            <Button variant="outline" size="sm" className="lg:ml-auto">
-              <Filter className="size-4" />
-              Advanced
-            </Button>
-          </div>
-        </div>
-
-        {error && <div className="mx-4 mt-4 rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>}
-
-        {!error && rows === null && (
-          <div className="flex flex-col gap-3 px-4 py-4">
-            {Array.from({ length: 5 }).map((_, i) => (
-              <Skeleton key={i} className="h-14 w-full" />
-            ))}
-          </div>
-        )}
-
-        {!error && rows !== null && visibleRows.length === 0 && (
-          <div className="flex flex-col items-center gap-4 px-4 py-20 text-center">
-            <Package2 className="size-12 text-muted-foreground" />
-            <p className="text-base text-muted-foreground">{hasFilters ? "No slips match your filters." : "No slips yet."}</p>
-          </div>
-        )}
-
-        {!error && rows !== null && visibleRows.length > 0 && (
-          <>
-            <div className="overflow-x-auto">
-              <Table className="text-base">
-                <TableHeader>
-                  <TableRow>
-                    <TableHead className="h-12 px-4 text-sm">Slip</TableHead>
-                    <TableHead className="h-12 px-4 text-sm">Customer</TableHead>
-                    <TableHead className="h-12 px-4 text-sm">Date</TableHead>
-                    <TableHead className="h-12 px-4 text-sm">Status</TableHead>
-                    <TableHead className="h-12 px-4 text-sm text-right">Lines</TableHead>
-                    <TableHead className="h-12 px-4 text-sm text-right">Gross</TableHead>
-                    <TableHead className="h-12 px-4 text-sm text-right">Discount</TableHead>
-                    <TableHead className="h-12 px-4 text-sm text-right">Net</TableHead>
-                    <TableHead className="h-12 px-4 text-sm">Actions</TableHead>
-                  </TableRow>
-                </TableHeader>
-                <TableBody>
-                  {visibleRows.map((row) => (
-                    <TableRow key={row.salesSlipId} className="hover:bg-muted/40">
-                      <TableCell className="px-4 py-3.5 font-medium">
-                        <Link href={`/dashboard/sales/slips/${row.salesSlipId}`} className="hover:underline">
-                          {row.slipNo}
-                        </Link>
-                      </TableCell>
-                      <TableCell className="px-4 py-3.5">{row.customerSnapshotName}</TableCell>
-                      <TableCell className="px-4 py-3.5 text-muted-foreground">{new Date(row.createdAt).toLocaleDateString()}</TableCell>
-                      <TableCell className="px-4 py-3.5">
-                        <Badge variant="outline" className={statusClass(row.status)}>
-                          {row.status}
-                        </Badge>
-                      </TableCell>
-                      <TableCell className="px-4 py-3.5 text-right font-mono tabular-nums">{row.totals.freeQtyTotal.toFixed(2)}</TableCell>
-                      <TableCell className="px-4 py-3.5 text-right font-mono tabular-nums">{row.totals.subtotal.toFixed(2)}</TableCell>
-                      <TableCell className="px-4 py-3.5 text-right font-mono tabular-nums text-muted-foreground">-{row.totals.discountTotal.toFixed(2)}</TableCell>
-                      <TableCell className="px-4 py-3.5 text-right font-mono font-semibold tabular-nums">{row.totals.grandTotal.toFixed(2)}</TableCell>
-                      <TableCell className="px-4 py-3.5">
-                        <div className="flex justify-end">
-                          <Link href={`/dashboard/sales/slips/${row.salesSlipId}`} className="inline-flex h-8 w-8 items-center justify-center rounded-full border border-border text-muted-foreground hover:bg-muted hover:text-foreground" aria-label={`View slip ${row.slipNo}`}>
-                            <Eye className="size-4" />
-                          </Link>
-                        </div>
-                      </TableCell>
-                    </TableRow>
-                  ))}
-                </TableBody>
-              </Table>
-            </div>
-
-            <div className="border-t px-4 py-3">
-              <div className="grid gap-3 text-sm md:grid-cols-3">
-                <div className="rounded-lg border bg-muted/20 px-3 py-2">
-                  <div className="text-muted-foreground">Gross total</div>
-                  <div className="font-mono text-base font-semibold tabular-nums">{grossTotal.toFixed(2)}</div>
-                </div>
-                <div className="rounded-lg border bg-muted/20 px-3 py-2">
-                  <div className="text-muted-foreground">Discount total</div>
-                  <div className="font-mono text-base font-semibold tabular-nums">-{discountTotal.toFixed(2)}</div>
-                </div>
-                <div className="rounded-lg border bg-muted/20 px-3 py-2">
-                  <div className="text-muted-foreground">Net total</div>
-                  <div className="font-mono text-base font-semibold tabular-nums">{netTotal.toFixed(2)}</div>
-                </div>
-              </div>
-            </div>
-
-            {pagination && pagination.totalPages > 1 && (
-              <div className="flex flex-col gap-3 border-t px-4 py-4 sm:flex-row sm:items-center sm:justify-between">
-                <p className="text-sm text-muted-foreground">
-                  Showing {(pagination.page - 1) * pagination.pageSize + 1}-{Math.min(pagination.page * pagination.pageSize, pagination.totalItems)} of {pagination.totalItems}
-                </p>
-                <div className="flex items-center gap-2">
-                  <Button type="button" variant="outline" size="sm" disabled={pagination.page <= 1} onClick={() => setPage((p) => Math.max(1, p - 1))}>
-                    <ChevronLeft />
-                    Previous
-                  </Button>
-                  <span className="text-sm text-muted-foreground">Page {pagination.page} of {pagination.totalPages}</span>
-                  <Button type="button" variant="outline" size="sm" disabled={pagination.page >= pagination.totalPages} onClick={() => setPage((p) => Math.min(pagination.totalPages, p + 1))}>
-                    Next
-                    <ChevronRight />
-                  </Button>
-                </div>
-              </div>
-            )}
-          </>
-        )}
-      </div>
-    </div>
-  )
-}

Frontend/erp-system/app/dashboard/stock/adjustments/page.tsx

@@ -81,6 +81,7 @@ export default function AdjustmentsListPage() {
               <TableHead className="h-12 px-3 text-sm">Warehouse</TableHead>
               <TableHead className="h-12 px-3 text-sm">Reason</TableHead>
               <TableHead className="h-12 px-3 text-sm">Status</TableHead>
+              <TableHead className="h-12 px-3 text-sm">GL Journal</TableHead>
               <TableHead className="h-12 px-3 text-sm">Created</TableHead>
             </TableRow>
           </TableHeader>
@@ -93,6 +94,7 @@ export default function AdjustmentsListPage() {
                 <TableCell className="px-3 py-3.5">
                   <AdjustmentStatusBadge status={a.status} />
                 </TableCell>
+                <TableCell className="px-3 py-3.5 text-muted-foreground">{a.glJournalNo ?? "—"}</TableCell>
                 <TableCell className="px-3 py-3.5">{new Date(a.createdAt).toLocaleString()}</TableCell>
               </TableRow>
             ))}

Frontend/erp-system/app/dashboard/stock/counts/[id]/page.tsx

@@ -124,6 +124,9 @@ export default function CountDetailPage() {
             <p className="text-base font-semibold">Posted — variance adjustment #{postResult.adjustmentId} created</p>
           </div>
           <div className="text-sm text-muted-foreground">Ledger refs: {postResult.ledgerRefs.join(", ") || "none (no variance)"}</div>
+          {postResult.glJournalNo && (
+            <div className="text-sm text-muted-foreground">GL journal: <span className="font-medium text-foreground">{postResult.glJournalNo}</span></div>
+          )}
         </div>
       )}
 

Frontend/erp-system/app/dashboard/vendors/[id]/page.tsx

@@ -8,6 +8,7 @@ import { AlertTriangle, Save } from "lucide-react"
 import { vendorsApi } from "@/lib/api/vendors"
 import { errorMessage, fieldErrors } from "@/lib/error-map"
 import { cn } from "@/lib/utils"
+import { generateVendorCode } from "@/lib/vendor-code"
 import { Vendor } from "@/types/master-data"
 
 import { Button, buttonVariants } from "@/components/ui/button"
@@ -39,6 +40,22 @@ export default function VendorDetailPage() {
   const [saving, setSaving] = useState(false)
   const [togglingStatus, setTogglingStatus] = useState(false)
 
+  // Every other vendor's code, to de-dupe against when the name edit regenerates this
+  // vendor's own code (mirrors the create dialog's `allVendorCodes`, app/dashboard/vendors/page.tsx).
+  const [otherVendorCodes, setOtherVendorCodes] = useState<string[]>([])
+
+  useEffect(() => {
+    vendorsApi
+      .list({ pageSize: 200 })
+      .then((res) => setOtherVendorCodes(res.items.filter((v) => v.vendorId !== vendorId).map((v) => v.code)))
+      .catch(() => {})
+  }, [vendorId])
+
+  function handleNameChange(value: string) {
+    setName(value)
+    setCode(value.trim() ? generateVendorCode(value, otherVendorCodes) : "")
+  }
+
   function load() {
     setLoadError(null)
     vendorsApi
@@ -177,13 +194,13 @@ export default function VendorDetailPage() {
 
       <div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
         <div className="flex flex-col gap-2">
-          <Label className="text-base">Code</Label>
-          <Input value={code} onChange={(e) => setCode(e.target.value)} aria-invalid={!!errors.code} className="h-12 text-base" disabled={conflict} />
+          <Label className="text-base">Code (auto-generated)</Label>
+          <Input value={code} readOnly disabled className="h-12 text-base text-muted-foreground" />
           <FieldError errors={[errors.code ? { message: errors.code } : undefined]} />
         </div>
         <div className="flex flex-col gap-2">
           <Label className="text-base">Name</Label>
-          <Input value={name} onChange={(e) => setName(e.target.value)} aria-invalid={!!errors.name} className="h-12 text-base" disabled={conflict} />
+          <Input value={name} onChange={(e) => handleNameChange(e.target.value)} aria-invalid={!!errors.name} className="h-12 text-base" disabled={conflict} />
           <FieldError errors={[errors.name ? { message: errors.name } : undefined]} />
         </div>
         <div className="flex flex-col gap-2">

Frontend/erp-system/app/login/page.tsx

@@ -80,7 +80,7 @@ function LoginForm() {
       <main className="relative z-10 flex min-h-screen w-full flex-col justify-center bg-white dark:bg-background px-6 py-12 sm:px-12 md:w-[45%]">
         <div className="mb-8 flex justify-center">
           <Link href="/" className="inline-flex items-center">
-            <Image src="/images/logo%20(2).png" alt="Hexa ERP" width={300} height={150} />
+            <Image src="/images/hexa-erp-logo.png" alt="Hexa ERP" width={300} height={150} />
           </Link>
         </div>
 

Frontend/erp-system/app/print/sales/slips/[id]/page.tsx

@@ -1,145 +0,0 @@
-"use client"
-
-import { use, useEffect, useMemo, useState } from "react"
-import { Printer } from "lucide-react"
-
-import { salesApi } from "@/lib/api/sales"
-import { customersApi } from "@/lib/api/customers"
-import { itemsApi } from "@/lib/api/items"
-import { uomsApi } from "@/lib/api/uoms"
-import { baseUomLabel } from "@/lib/uom-label"
-import { warehousesApi } from "@/lib/api/warehouses"
-import { usersApi } from "@/lib/api/users"
-import { errorMessage } from "@/lib/error-map"
-import { Button } from "@/components/ui/button"
-import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
-import { Customer } from "@/types/customers"
-import { ItemListItem, Uom, Warehouse } from "@/types/master-data"
-import { ManagedUser } from "@/types/users"
-import { SalesSlip } from "@/types/sales"
-
-export default function SalesSlipPrintPage({ params }: { params: Promise<{ id: string }> }) {
-  const resolvedParams = use(params)
-  const slipId = Number(resolvedParams.id)
-  const [slip, setSlip] = useState<SalesSlip | null>(null)
-  const [customers, setCustomers] = useState<Customer[]>([])
-  const [items, setItems] = useState<ItemListItem[]>([])
-  const [uoms, setUoms] = useState<Uom[]>([])
-  const [warehouses, setWarehouses] = useState<Warehouse[]>([])
-  const [users, setUsers] = useState<ManagedUser[]>([])
-  const [error, setError] = useState<string | null>(null)
-
-  useEffect(() => {
-    if (!Number.isFinite(slipId)) {
-      setError(`Invalid slip id '${resolvedParams.id}'.`)
-      return
-    }
-
-    Promise.all([
-      customersApi.list({ pageSize: 200 }),
-      itemsApi.list({ pageSize: 200 }),
-      uomsApi.list({ pageSize: 200 }),
-      warehousesApi.list({ pageSize: 200 }),
-      usersApi.list({ pageSize: 200 }),
-      salesApi.getSlip(slipId),
-    ])
-      .then(([cust, itemRes, uomRes, whRes, userRes, doc]) => {
-        setCustomers(cust.items)
-        setItems(itemRes.items)
-        setUoms(uomRes.items)
-        setWarehouses(whRes.items)
-        setUsers(userRes.items)
-        setSlip(doc.data)
-      })
-      .catch((err) => setError(errorMessage(err)))
-  }, [resolvedParams.id, slipId])
-
-  const subtotal = useMemo(() => slip?.totals.subtotal ?? 0, [slip])
-
-  if (error && !slip) {
-    return <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>
-  }
-
-  if (!slip) {
-    return <div className="rounded-2xl border border-dashed p-8 text-muted-foreground">{error ?? "Slip print data is loading or unavailable."}</div>
-  }
-
-  const customer = customers.find((c) => c.customerId === slip.customerId)
-  const warehouse = warehouses.find((w) => w.warehouseId === slip.warehouseId)
-
-  return (
-    <div className="mx-auto flex w-full max-w-5xl flex-col gap-6 rounded-3xl border bg-white p-6 shadow-sm print:rounded-none print:border-0 print:p-0 print:shadow-none">
-      <div className="flex items-center justify-end print:hidden">
-        <Button variant="outline" onClick={() => window.print()}>
-          <Printer className="size-4" />
-          Print
-        </Button>
-      </div>
-
-      <div className="border-b pb-5">
-        <div className="text-xs font-semibold uppercase tracking-[0.3em] text-muted-foreground">Sales Slip</div>
-        <h1 className="mt-2 text-3xl font-semibold text-foreground">{slip.slipNo}</h1>
-        <div className="mt-2 text-sm text-muted-foreground">Status: {slip.status} · Date: {new Date(slip.slipDate).toLocaleDateString()}</div>
-      </div>
-
-      <div className="grid gap-4 md:grid-cols-3">
-        <div className="rounded-2xl border bg-muted/20 p-4">
-          <div className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Customer</div>
-          <div className="mt-2 text-lg font-semibold text-foreground">{slip.customerSnapshotName}</div>
-          <div className="mt-1 text-sm text-muted-foreground">Customer ID: {slip.customerId}</div>
-          {customer?.displayName ? <div className="mt-1 text-sm text-muted-foreground">Customer: {customer.displayName}</div> : null}
-        </div>
-        <div className="rounded-2xl border bg-muted/20 p-4">
-          <div className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Warehouse</div>
-          <div className="mt-2 text-lg font-semibold text-foreground">{warehouse?.name ?? `#${slip.warehouseId}`}</div>
-          <div className="mt-1 text-sm text-muted-foreground">Code: {warehouse?.code ?? slip.warehouseId}</div>
-        </div>
-        <div className="rounded-2xl border bg-muted/20 p-4">
-          <div className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Totals</div>
-          <div className="mt-2 grid grid-cols-2 gap-2 text-sm">
-            <div className="text-muted-foreground">Subtotal</div><div className="text-right font-medium">{slip.totals.subtotal.toFixed(2)}</div>
-            <div className="text-muted-foreground">Discount</div><div className="text-right font-medium">{slip.totals.discountTotal.toFixed(2)}</div>
-            <div className="text-muted-foreground">Free qty</div><div className="text-right font-medium">{slip.totals.freeQtyTotal.toFixed(2)}</div>
-            <div className="text-muted-foreground">Net total</div><div className="text-right font-semibold">{slip.totals.grandTotal.toFixed(2)}</div>
-          </div>
-        </div>
-      </div>
-
-      <div className="overflow-hidden rounded-2xl border">
-        <Table>
-          <TableHeader>
-            <TableRow>
-              <TableHead>Item</TableHead>
-              <TableHead>UOM</TableHead>
-              <TableHead className="text-right">Qty</TableHead>
-              <TableHead className="text-right">Free</TableHead>
-              <TableHead className="text-right">Unit price</TableHead>
-              <TableHead className="text-right">Line total</TableHead>
-            </TableRow>
-          </TableHeader>
-          <TableBody>
-            {slip.lines.map((line) => (
-              <TableRow key={line.salesSlipLineId}>
-                <TableCell>
-                  <div className="font-medium text-foreground">{line.description}</div>
-                  <div className="text-xs text-muted-foreground">SKU {items.find((i) => i.itemId === line.itemId)?.sku ?? `#${line.itemId}`}</div>
-                </TableCell>
-                <TableCell>{baseUomLabel(items, uoms, line.itemId)}</TableCell>
-                <TableCell className="text-right">{line.qty.toFixed(0)}</TableCell>
-                <TableCell className="text-right">{line.freeQty > 0 ? line.freeQty.toFixed(0) : "—"}</TableCell>
-                <TableCell className="text-right">{line.unitPrice.toFixed(2)}</TableCell>
-                <TableCell className="text-right font-medium">{line.lineTotal.toFixed(2)}</TableCell>
-              </TableRow>
-            ))}
-          </TableBody>
-        </Table>
-      </div>
-
-      <div className="rounded-2xl border bg-muted/20 p-4">
-        <div className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">Cashier</div>
-        <div className="mt-2 text-sm text-foreground">{users.find((u) => u.userId === slip.cashierUserId)?.displayName ?? `#${slip.cashierUserId}`}</div>
-        <div className="mt-3 text-sm text-muted-foreground">Subtotal: {subtotal.toFixed(2)}</div>
-      </div>
-    </div>
-  )
-}

Frontend/erp-system/app/print/sales/slips/page.tsx

@@ -1,114 +0,0 @@
-"use client"
-
-import { Suspense, useEffect, useState } from "react"
-import { useSearchParams } from "next/navigation"
-import { Printer } from "lucide-react"
-
-import { salesApi } from "@/lib/api/sales"
-import { errorMessage } from "@/lib/error-map"
-import { Button } from "@/components/ui/button"
-import { Badge } from "@/components/ui/badge"
-import { Skeleton } from "@/components/ui/skeleton"
-import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
-import { SalesSlipSummary } from "@/types/sales"
-
-function statusClass(status: SalesSlipSummary["status"]) {
-  switch (status) {
-    case "Draft":
-      return "border-amber-200 bg-amber-50 text-amber-800"
-    case "Posted":
-      return "border-emerald-200 bg-emerald-50 text-emerald-800"
-    case "Cancelled":
-      return "border-rose-200 bg-rose-50 text-rose-800"
-  }
-}
-
-function SalesSlipBatchPrintContent() {
-  const searchParams = useSearchParams()
-  const status = searchParams.get("status") ?? "All"
-  const query = searchParams.get("q") ?? ""
-  const [rows, setRows] = useState<SalesSlipSummary[] | null>(null)
-  const [error, setError] = useState<string | null>(null)
-
-  useEffect(() => {
-      salesApi
-      .listSlips({ page: 1, pageSize: 200 })
-      .then((res) => setRows(res.items))
-      .catch((err) => setError(errorMessage(err)))
-  }, [])
-
-  const visibleRows = rows?.filter((row) => {
-    const matchesStatus = status === "All" || row.status === status
-    const matchesQuery =
-      `${row.slipNo} ${row.customerSnapshotName}`.toLowerCase().includes(query.toLowerCase())
-    return matchesStatus && matchesQuery
-  })
-
-  if (error && !rows) {
-    return <div className="rounded-lg border border-destructive/30 bg-destructive/5 p-5 text-base text-destructive">{error}</div>
-  }
-
-  if (!rows) {
-    return <div className="rounded-2xl border border-dashed p-8 text-muted-foreground">{error ?? "Slip batch print data is loading or unavailable."}</div>
-  }
-
-  return (
-    <div className="mx-auto flex w-full max-w-6xl flex-col gap-6 rounded-3xl border bg-white p-6 shadow-sm print:rounded-none print:border-0 print:p-0 print:shadow-none">
-      <div className="flex items-center justify-end print:hidden">
-        <Button variant="outline" onClick={() => window.print()}>
-          <Printer className="size-4" />
-          Print
-        </Button>
-      </div>
-
-      <div className="border-b pb-4">
-        <div className="text-xs font-semibold uppercase tracking-[0.3em] text-muted-foreground">Sales Slips</div>
-        <h1 className="mt-2 text-3xl font-semibold text-foreground">Slip Batch Print</h1>
-        <p className="mt-2 text-sm text-muted-foreground">Printed register snapshot of current slips.</p>
-      </div>
-
-      <div className="overflow-hidden rounded-2xl border">
-        <Table>
-          <TableHeader>
-            <TableRow>
-              <TableHead>Slip</TableHead>
-              <TableHead>Customer</TableHead>
-              <TableHead>Date</TableHead>
-              <TableHead>Status</TableHead>
-              <TableHead className="text-right">Lines</TableHead>
-              <TableHead className="text-right">Gross</TableHead>
-              <TableHead className="text-right">Discount</TableHead>
-              <TableHead className="text-right">Net</TableHead>
-            </TableRow>
-          </TableHeader>
-          <TableBody>
-            {visibleRows?.map((row) => (
-              <TableRow key={row.salesSlipId}>
-                <TableCell className="font-medium">{row.slipNo}</TableCell>
-                <TableCell>{row.customerSnapshotName}</TableCell>
-                <TableCell>{new Date(row.createdAt).toLocaleDateString()}</TableCell>
-                <TableCell>
-                  <Badge variant="outline" className={statusClass(row.status)}>
-                    {row.status}
-                  </Badge>
-                </TableCell>
-                <TableCell className="text-right">{row.totals.freeQtyTotal.toFixed(2)}</TableCell>
-                <TableCell className="text-right">{row.totals.subtotal.toFixed(2)}</TableCell>
-                <TableCell className="text-right">-{row.totals.discountTotal.toFixed(2)}</TableCell>
-                <TableCell className="text-right font-medium">{row.totals.grandTotal.toFixed(2)}</TableCell>
-              </TableRow>
-            ))}
-          </TableBody>
-        </Table>
-      </div>
-    </div>
-  )
-}
-
-export default function SalesSlipBatchPrintPage() {
-  return (
-    <Suspense fallback={<Skeleton className="h-48 w-full" />}>
-      <SalesSlipBatchPrintContent />
-    </Suspense>
-  )
-}

Frontend/erp-system/components/Layouts/AppSidebar.tsx

@@ -1,6 +1,7 @@
 "use client"
 
 import { useEffect, useState } from "react"
+import Image from "next/image"
 import Link from "next/link"
 import { usePathname } from "next/navigation"
 import {
@@ -114,15 +115,14 @@ const navItems: {
     icon: ReceiptText,
     chevron: true,
     children: [
-      { title: "Invoices", code: "sales.invoices", href: "/dashboard/sales/invoices", icon: FileText },
-      { title: "Slips", code: "sales.slips", href: "/dashboard/sales/slips", icon: ShoppingCart },
+      { title: "Sales", code: "sales.invoices", href: "/dashboard/sales/invoices", icon: FileText },
       { title: "Bundle Sales", code: "sales.bundle-sales", href: "/dashboard/sales/bundles", icon: Boxes },
       { title: "Free Issues", code: "sales.free-issues", href: "/dashboard/sales/free-issues", icon: PackageX },
       // { title: "Reports", code: "sales.reports", href: "/dashboard/sales/reports", icon: FileBarChart },
     ],
   },
   { title: "Sales Returns", code: "sales-returns", href: "/dashboard/sales/sales-returns", icon: Undo2 },
-  { title: "Receiving", code: "receiving", href: "/dashboard/receiving/grn", icon: PackageCheck, chevron: true },
+  { title: "GRN", code: "receiving", href: "/dashboard/receiving/grn", icon: PackageCheck, chevron: true },
   {
     title: "Stock",
     code: "stock",
@@ -144,7 +144,6 @@ const navItems: {
     ],
   },
   { title: "Warehouses", code: "warehouses", href: "/dashboard/warehouse", icon: Building2, chevron: true },
-  { title: "Orders", code: "orders", href: "/dashboard/orders", icon: ShoppingCart, chevron: true },
   {
     title: "Production",
     code: "production",
@@ -155,6 +154,7 @@ const navItems: {
     children: [
       { title: "Templates", code: "production.templates", href: "/dashboard/production/templates", icon: LayoutTemplate },
       { title: "Runs", code: "production.runs", href: "/dashboard/production/runs", icon: PlayCircle },
+      { title: "Produced", code: "production.produced", href: "/dashboard/production/produced", icon: PackageCheck },
     ],
   },
   {
@@ -275,13 +275,14 @@ function SidebarContent({
         )}
       >
         <Link href="/dashboard" className="flex items-center gap-2.5" onClick={onClose}>
-          <div className="flex size-8 shrink-0 items-center justify-center rounded-xl bg-primary/10">
-            <svg viewBox="0 0 48 32" className="h-3.5 w-5 fill-primary">
-              <path d="M24 16c-3-8-11-12-16-8s-3 14 6 14c5 0 8.5-2.5 10-6 1.5 3.5 5 6 10 6 9 0 11-10 6-14s-13 0-16 8Z" />
-            </svg>
-          </div>
-          {!iconOnly && (
-            <span className="text-lg font-bold tracking-tight text-foreground">Hexa ERP</span>
+          {iconOnly ? (
+            <div className="flex size-8 shrink-0 items-center justify-center rounded-xl bg-primary/10">
+              <svg viewBox="0 0 48 32" className="h-3.5 w-5 fill-primary">
+                <path d="M24 16c-3-8-11-12-16-8s-3 14 6 14c5 0 8.5-2.5 10-6 1.5 3.5 5 6 10 6 9 0 11-10 6-14s-13 0-16 8Z" />
+              </svg>
+            </div>
+          ) : (
+            <Image src="/images/hexa-erp-logo.png" alt="Hexa ERP" width={165} height={40} className="h-10 w-auto" priority />
           )}
         </Link>
 
@@ -407,13 +408,11 @@ function SidebarContent({
         })}
       </ul>
 
-      <div className="flex items-center justify-center pt-6">
-        <div className="flex size-12 items-center justify-center rounded-2xl bg-muted ring-1 ring-foreground/10">
-          <svg viewBox="0 0 48 32" className="h-4 w-6 fill-muted-foreground">
-            <path d="M24 16c-3-8-11-12-16-8s-3 14 6 14c5 0 8.5-2.5 10-6 1.5 3.5 5 6 10 6 9 0 11-10 6-14s-13 0-16 8Z" />
-          </svg>
-        </div>
-      </div>
+      {!iconOnly && (
+        <p className="pt-6 text-center text-xs text-muted-foreground">
+          © {new Date().getFullYear()} Hexa ERP
+        </p>
+      )}
     </nav>
   )
 }

Frontend/erp-system/components/Layouts/Breadcrumbs.tsx

@@ -38,6 +38,7 @@ const SEGMENT_LABELS: Record<string, string> = {
   production: "Production",
   templates: "Templates",
   runs: "Runs",
+  invoices: "Sales",
 }
 
 function labelFor(segment: string): string {