Phase G: Add Budgeting and Year-End Close
Budgeting: - Budget + BudgetLine entities with Jan–Dec monthly columns per GL account - BudgetsController: Index, Create, Edit, SetDefault, Copy, Delete - Copy action rolls a budget forward to a new fiscal year - Budget vs. Actual report (BudgetVsActual): compares monthly budget amounts to real P&L by calling GetProfitAndLossAsync once per month; variance shown as favorable/unfavorable; year + budget selectors in header - Views: Budgets/Index, Create, Edit with inline annual totals via budget-edit.js - Nav link + report card on Landing Year-End Close: - YearEndClose entity records each closed year + JE reference for audit trail - AccountsController.YearEndClose GET (history + form) + CloseYear POST - Close zeroes all Revenue and Expense/COGS account balances into Retained Earnings via IAccountBalanceService and posts a supporting JE dated Dec 31 - Idempotency: rejects attempt to close an already-closed year - Pre-close checklist in view to guide the workflow - Nav link under Finance Migration AddBudgetsAndYearEndClose applied Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,164 @@
|
||||
@using PowderCoating.Web.Controllers
|
||||
@model BudgetCreateVm
|
||||
|
||||
@{
|
||||
ViewData["Title"] = $"Edit Budget — {Model.Name}";
|
||||
ViewData["PageIcon"] = "bi-pencil";
|
||||
var months = new[] { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
|
||||
}
|
||||
|
||||
<div class="mb-4 d-flex justify-content-between align-items-center">
|
||||
<a asp-action="Index" class="btn btn-outline-secondary btn-sm">
|
||||
<i class="bi bi-arrow-left me-1"></i>Back to Budgets
|
||||
</a>
|
||||
<a asp-controller="Reports" asp-action="BudgetVsActual" asp-route-budgetId="@Model.Id" class="btn btn-outline-primary btn-sm">
|
||||
<i class="bi bi-bar-chart-line me-1"></i>View Budget vs. Actual
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<form asp-action="Edit" asp-route-id="@Model.Id" method="post" id="budgetForm">
|
||||
@Html.AntiForgeryToken()
|
||||
<input type="hidden" asp-for="Id" />
|
||||
<input type="hidden" asp-for="FiscalYear" />
|
||||
|
||||
<div class="card border-0 shadow-sm mb-4">
|
||||
<div class="card-header bg-white border-0 py-3">
|
||||
<h5 class="mb-0 fw-semibold">
|
||||
<i class="bi bi-pie-chart me-2 text-primary"></i>@Model.Name — @Model.FiscalYear
|
||||
</h5>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="row g-3">
|
||||
<div class="col-md-5">
|
||||
<label class="form-label">Budget Name <span class="text-danger">*</span></label>
|
||||
<input asp-for="Name" class="form-control" required />
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<label class="form-label">Notes</label>
|
||||
<input asp-for="Notes" class="form-control" />
|
||||
</div>
|
||||
<div class="col-md-3 d-flex align-items-end">
|
||||
<div class="form-check form-switch mb-2">
|
||||
<input asp-for="IsDefault" class="form-check-input" type="checkbox" />
|
||||
<label asp-for="IsDefault" class="form-check-label">Make this the default budget for @Model.FiscalYear</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card border-0 shadow-sm mb-4">
|
||||
<div class="card-header bg-white border-0 py-3 d-flex justify-content-between align-items-center">
|
||||
<h5 class="mb-0 fw-semibold"><i class="bi bi-table me-2 text-primary"></i>Monthly Amounts by Account</h5>
|
||||
<div class="d-flex gap-2">
|
||||
<button type="button" class="btn btn-outline-secondary btn-sm" id="fillEvenlyBtn">
|
||||
<i class="bi bi-distribute-horizontal me-1"></i>Spread Annual Evenly
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="alert alert-info py-2 mx-3 mt-3 mb-0 small">
|
||||
<i class="bi bi-info-circle me-1"></i>
|
||||
Enter monthly amounts for each Revenue and Expense account. Leave a row at zero to exclude that account from the budget. Amounts represent expected <strong>activity</strong> for the period (not running totals).
|
||||
</div>
|
||||
<div class="card-body p-0">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-sm table-hover align-middle mb-0" id="budgetTable">
|
||||
<thead class="table-light sticky-top">
|
||||
<tr>
|
||||
<th style="min-width:200px">Account</th>
|
||||
<th class="text-end" style="min-width:80px">Annual</th>
|
||||
@foreach (var m in months)
|
||||
{
|
||||
<th class="text-end" style="min-width:75px">@m</th>
|
||||
}
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@{
|
||||
var revLines = Model.Lines.Where(l => l.AccountType == PowderCoating.Core.Enums.AccountType.Revenue).ToList();
|
||||
var expLines = Model.Lines.Where(l => l.AccountType != PowderCoating.Core.Enums.AccountType.Revenue).ToList();
|
||||
var fieldNames = new[] { "Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec" };
|
||||
}
|
||||
|
||||
@if (revLines.Any())
|
||||
{
|
||||
<tr class="table-success">
|
||||
<td colspan="14" class="fw-semibold py-1 ps-3 small">REVENUE</td>
|
||||
</tr>
|
||||
@for (int i = 0; i < Model.Lines.Count; i++)
|
||||
{
|
||||
var line = Model.Lines[i];
|
||||
if (line.AccountType != PowderCoating.Core.Enums.AccountType.Revenue) continue;
|
||||
var values = new decimal[] { line.Jan, line.Feb, line.Mar, line.Apr, line.May, line.Jun, line.Jul, line.Aug, line.Sep, line.Oct, line.Nov, line.Dec };
|
||||
<tr data-row-idx="@i">
|
||||
<td>
|
||||
<input type="hidden" name="Lines[@i].AccountId" value="@line.AccountId" />
|
||||
<input type="hidden" name="Lines[@i].AccountNumber" value="@line.AccountNumber" />
|
||||
<input type="hidden" name="Lines[@i].AccountName" value="@line.AccountName" />
|
||||
<input type="hidden" name="Lines[@i].AccountType" value="@((int)line.AccountType)" />
|
||||
<span class="fw-semibold text-nowrap">@line.AccountNumber</span>
|
||||
<span class="text-muted ms-1">@line.AccountName</span>
|
||||
</td>
|
||||
<td class="text-end"><span class="annual-total fw-semibold text-success" data-row="@i">@line.Annual.ToString("N2")</span></td>
|
||||
@for (int m = 0; m < 12; m++)
|
||||
{
|
||||
<td class="text-end p-0">
|
||||
<input type="number" name="Lines[@i].@fieldNames[m]"
|
||||
value="@values[m].ToString("F2", System.Globalization.CultureInfo.InvariantCulture)"
|
||||
class="form-control form-control-sm text-end border-0 budget-cell"
|
||||
step="0.01" min="0" data-row="@i" style="min-width:70px" />
|
||||
</td>
|
||||
}
|
||||
</tr>
|
||||
}
|
||||
}
|
||||
|
||||
@if (expLines.Any())
|
||||
{
|
||||
<tr class="table-danger">
|
||||
<td colspan="14" class="fw-semibold py-1 ps-3 small">EXPENSE</td>
|
||||
</tr>
|
||||
@for (int i = 0; i < Model.Lines.Count; i++)
|
||||
{
|
||||
var line = Model.Lines[i];
|
||||
if (line.AccountType == PowderCoating.Core.Enums.AccountType.Revenue) continue;
|
||||
var values = new decimal[] { line.Jan, line.Feb, line.Mar, line.Apr, line.May, line.Jun, line.Jul, line.Aug, line.Sep, line.Oct, line.Nov, line.Dec };
|
||||
<tr data-row-idx="@i">
|
||||
<td>
|
||||
<input type="hidden" name="Lines[@i].AccountId" value="@line.AccountId" />
|
||||
<input type="hidden" name="Lines[@i].AccountNumber" value="@line.AccountNumber" />
|
||||
<input type="hidden" name="Lines[@i].AccountName" value="@line.AccountName" />
|
||||
<input type="hidden" name="Lines[@i].AccountType" value="@((int)line.AccountType)" />
|
||||
<span class="fw-semibold text-nowrap">@line.AccountNumber</span>
|
||||
<span class="text-muted ms-1">@line.AccountName</span>
|
||||
</td>
|
||||
<td class="text-end"><span class="annual-total fw-semibold text-danger" data-row="@i">@line.Annual.ToString("N2")</span></td>
|
||||
@for (int m = 0; m < 12; m++)
|
||||
{
|
||||
<td class="text-end p-0">
|
||||
<input type="number" name="Lines[@i].@fieldNames[m]"
|
||||
value="@values[m].ToString("F2", System.Globalization.CultureInfo.InvariantCulture)"
|
||||
class="form-control form-control-sm text-end border-0 budget-cell"
|
||||
step="0.01" min="0" data-row="@i" style="min-width:70px" />
|
||||
</td>
|
||||
}
|
||||
</tr>
|
||||
}
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="d-flex gap-2">
|
||||
<button type="submit" class="btn btn-primary">
|
||||
<i class="bi bi-check-lg me-2"></i>Save Changes
|
||||
</button>
|
||||
<a asp-action="Index" class="btn btn-outline-secondary">Cancel</a>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
@section Scripts {
|
||||
<script src="~/js/budget-edit.js" asp-append-version="true"></script>
|
||||
}
|
||||
Reference in New Issue
Block a user