Fixed assets, fully featured: tags, serials, acquisition links, label sheets, the fixed asset register, and an Assets section in the viewer; fix a flaky verify
- core: asset tags (generated PREFIX-0001 or the human's own; unique ignoring case; never reused by another asset) and serial numbers (rules.md B-24); a journaled link from an asset to the entry that acquired it (posted, unreversed, debiting the cost account); fixed_asset_register(as_of), reconciled to the GL (unposted depreciation, unregistered cost) - store: asset.tagged, asset.serial_set, asset.acquisition_linked journaled, replayed, projected (schema v9); differs_from now also compares control roles and tag history - config: [books] asset_tag_prefix, default the company's initials without legal-form words - import: Avery 5160/8160 label sheets with QR codes (geometry vendored from Avery, docs/spec/sources/avery-5160.md); the register as XLSX and PDF - mcp: register_asset tags (and links) automatically; books.label_asset, books.asset_labels; asset tools take a tag; books.show asset / assets page / register report; export fixed_asset_register (json, csv, xlsx, pdf) and in the CPA package - viewer: Assets page (register, reconciliation), asset page (identity, schedule posted vs not, entries, documents), Fixed asset register report, global search by tag/serial/description, journal text, needs-attention items - fix: verify compared snapshot amounts as strings; a zero total summed in hash-map order could print "0" or "0.00", so agreeing books failed verify at random. Now by value (regression test) - tests: spec-blind suites for tags, register, prefix, store, MCP; label and register PDF/XLSX tests; viewer tests Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01GWVo7x3UHw5kwCUaWxiejX
This commit is contained in:
swaitsandClaude Opus 5.5 committed
1 parent
4e96b5f54d
commit
cd085108c1
53 files changed
+7872
-104
No files matched your search
@@ -0,0 +1,370 @@
|
||||
//! The fixed asset register as XLSX and PDF, for the CPA.
|
||||
//!
|
||||
//! [`ledger_core::fixed_asset_register`] computes the register; [`layout`]
|
||||
//! lays it out once — columns, one line per asset, the totals, and the
|
||||
//! reconciliation to the general ledger — and both renderers draw from
|
||||
//! that layout, so they can't drift apart. Amounts stay exact `Decimal`s
|
||||
//! until a renderer writes them, through the same paths as the statements
|
||||
//! ([`crate::report::amount_parts`] for PDF, the accounting number formats
|
||||
//! of [`crate::xlsx`] for XLSX).
|
||||
//!
|
||||
//! ```text
|
||||
//! GOAL: one list of what the company owns, its cost, depreciation, and
|
||||
//! book value, that a CPA can file, and that shows at a glance
|
||||
//! whether the register and the books agree.
|
||||
//! SOURCE: ledger_core::fixed_asset_register (INVARIANTS 1-4); CONVENTION
|
||||
//! (layout, the statements' header and footer).
|
||||
//! INVARIANTS:
|
||||
//! 1. One line per register row, in the register's order, disposed ones
|
||||
//! included and marked "Disposed DATE, proceeds AMOUNT"; held ones
|
||||
//! "Active".
|
||||
//! 2. The totals are the register's own totals (held assets only),
|
||||
//! never re-summed here.
|
||||
//! 3. Reconciliation: cost per register, per books, and their difference
|
||||
//! (unregistered_cost); accumulated depreciation per schedule, per
|
||||
//! books, and their difference (unposted_depreciation), exactly.
|
||||
//! 4. An empty register says "No fixed assets" and still shows totals
|
||||
//! and the reconciliation (the books may carry unregistered cost).
|
||||
//! 5. Header and footer as on every statement: company, "Fixed Asset
|
||||
//! Register", "As of DATE"; basis, prepared on, journal seq.
|
||||
//! 6. PDF: deterministic bytes; every text is data, never markup.
|
||||
//! ```
|
||||
|
||||
use crate::pdf::{INTER, PdfError};
|
||||
use crate::report::{ReportMeta, amount_parts, format_amount, long_date};
|
||||
use crate::xlsx::{Formats, XlsxError, footer, header, number};
|
||||
use ledger_core::reports::{AssetRegister, AssetRegisterRow};
|
||||
use rust_decimal::Decimal;
|
||||
use rust_xlsxwriter::{Format, FormatAlign, Workbook};
|
||||
use std::sync::OnceLock;
|
||||
use typst::foundations::{Dict, IntoValue};
|
||||
use typst_as_lib::{TypstEngine, TypstTemplateMainFile};
|
||||
use typst_layout::PagedDocument;
|
||||
|
||||
/// The report's title.
|
||||
pub const TITLE: &str = "Fixed Asset Register";
|
||||
|
||||
/// Column headings, left to right.
|
||||
pub const COLUMNS: [&str; 10] = [
|
||||
"Tag",
|
||||
"Description",
|
||||
"Serial",
|
||||
"In service",
|
||||
"Cost",
|
||||
"Salvage",
|
||||
"Life (months)",
|
||||
"Accumulated depreciation",
|
||||
"Book value",
|
||||
"Status",
|
||||
];
|
||||
|
||||
/// The line shown when there are no assets.
|
||||
pub const EMPTY: &str = "No fixed assets";
|
||||
|
||||
/// One asset's line.
|
||||
#[derive(Clone, Debug, PartialEq, Eq)]
|
||||
pub struct AssetLine {
|
||||
/// Tag, or empty.
|
||||
pub tag: String,
|
||||
/// What it is.
|
||||
pub description: String,
|
||||
/// Serial number, or empty.
|
||||
pub serial: String,
|
||||
/// In-service date, ISO 8601.
|
||||
pub in_service: String,
|
||||
/// Capitalized cost.
|
||||
pub cost: Decimal,
|
||||
/// Salvage value.
|
||||
pub salvage: Decimal,
|
||||
/// Useful life in months.
|
||||
pub life_months: u32,
|
||||
/// Accumulated depreciation by schedule (zero once disposed).
|
||||
pub accumulated: Decimal,
|
||||
/// Book value (zero once disposed).
|
||||
pub book_value: Decimal,
|
||||
/// "Active", or "Disposed 2026-09-30, proceeds 450.00".
|
||||
pub status: String,
|
||||
/// Disposed by the date (shown, not in the totals).
|
||||
pub disposed: bool,
|
||||
}
|
||||
|
||||
/// Which register column a reconciliation amount sits under.
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||
pub enum ReconColumn {
|
||||
/// Under "Cost".
|
||||
Cost,
|
||||
/// Under "Accumulated depreciation".
|
||||
Accumulated,
|
||||
}
|
||||
|
||||
/// One reconciliation line.
|
||||
#[derive(Clone, Debug, PartialEq, Eq)]
|
||||
pub struct ReconLine {
|
||||
/// "Cost per register", ...
|
||||
pub label: String,
|
||||
/// The amount.
|
||||
pub amount: Decimal,
|
||||
/// The column it reconciles.
|
||||
pub column: ReconColumn,
|
||||
/// A difference line (ruled above, bold).
|
||||
pub difference: bool,
|
||||
}
|
||||
|
||||
/// The register laid out for rendering.
|
||||
#[derive(Clone, Debug, PartialEq, Eq)]
|
||||
pub struct RegisterLayout {
|
||||
/// [`TITLE`].
|
||||
pub title: String,
|
||||
/// "As of October 15, 2026".
|
||||
pub period: String,
|
||||
/// One per asset, in register order.
|
||||
pub lines: Vec<AssetLine>,
|
||||
/// Total cost, accumulated depreciation, and book value of the assets
|
||||
/// held.
|
||||
pub totals: [Decimal; 3],
|
||||
/// Cost then accumulated depreciation: per register, per books,
|
||||
/// difference.
|
||||
pub reconciliation: Vec<ReconLine>,
|
||||
}
|
||||
|
||||
fn status(a: &AssetRegisterRow) -> String {
|
||||
match a.disposed {
|
||||
Some((date, proceeds)) => {
|
||||
format!("Disposed {date}, proceeds {}", format_amount(proceeds))
|
||||
}
|
||||
None => "Active".to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Lay the register out (see the module spec).
|
||||
pub fn layout(r: &AssetRegister) -> RegisterLayout {
|
||||
let recon = |label: &str, amount, column, difference| ReconLine {
|
||||
label: label.to_string(),
|
||||
amount,
|
||||
column,
|
||||
difference,
|
||||
};
|
||||
RegisterLayout {
|
||||
title: TITLE.to_string(),
|
||||
period: format!("As of {}", long_date(r.as_of)),
|
||||
lines: r
|
||||
.rows
|
||||
.iter()
|
||||
.map(|a| AssetLine {
|
||||
tag: a.tag.clone().unwrap_or_default(),
|
||||
description: a.description.clone(),
|
||||
serial: a.serial.clone().unwrap_or_default(),
|
||||
in_service: a.in_service.to_string(),
|
||||
cost: a.cost,
|
||||
salvage: a.salvage,
|
||||
life_months: a.useful_life_months,
|
||||
accumulated: a.accumulated,
|
||||
book_value: a.book_value,
|
||||
status: status(a),
|
||||
disposed: a.disposed.is_some(),
|
||||
})
|
||||
.collect(),
|
||||
totals: [r.total_cost, r.total_accumulated, r.total_book_value],
|
||||
reconciliation: vec![
|
||||
recon("Cost per register", r.total_cost, ReconColumn::Cost, false),
|
||||
recon("Cost per books", r.ledger_cost, ReconColumn::Cost, false),
|
||||
recon(
|
||||
"Difference (unregistered cost)",
|
||||
r.unregistered_cost(),
|
||||
ReconColumn::Cost,
|
||||
true,
|
||||
),
|
||||
recon(
|
||||
"Accumulated depreciation per schedule",
|
||||
r.total_accumulated,
|
||||
ReconColumn::Accumulated,
|
||||
false,
|
||||
),
|
||||
recon(
|
||||
"Accumulated depreciation per books",
|
||||
r.ledger_accumulated,
|
||||
ReconColumn::Accumulated,
|
||||
false,
|
||||
),
|
||||
recon(
|
||||
"Difference (not yet posted)",
|
||||
r.unposted_depreciation(),
|
||||
ReconColumn::Accumulated,
|
||||
true,
|
||||
),
|
||||
],
|
||||
}
|
||||
}
|
||||
|
||||
/// The fixed asset register as XLSX bytes.
|
||||
///
|
||||
/// Layout as every statement (crate::xlsx INVARIANT 4): company, title,
|
||||
/// and date on rows 1-3, headings on row 5, one row per asset from row 6,
|
||||
/// amounts as numbers in the accounting format; then the totals row
|
||||
/// (double rule), an empty row, "Reconciliation to the books", and its
|
||||
/// lines with amounts under Cost and Accumulated depreciation.
|
||||
pub fn asset_register_xlsx(r: &AssetRegister, meta: &ReportMeta) -> Result<Vec<u8>, XlsxError> {
|
||||
let l = layout(r);
|
||||
let mut workbook = Workbook::new();
|
||||
let sheet = workbook.add_worksheet();
|
||||
let f = Formats::new();
|
||||
sheet.set_name(TITLE)?;
|
||||
let width = COLUMNS.len() as u16;
|
||||
let mut row = header(sheet, &f, meta, &l.title, &l.period, width)?;
|
||||
for (i, h) in COLUMNS.iter().enumerate() {
|
||||
let fmt = if (4..=8).contains(&i) {
|
||||
&f.header_right
|
||||
} else {
|
||||
&f.header
|
||||
};
|
||||
sheet.write_string_with_format(row, i as u16, h.to_uppercase(), fmt)?;
|
||||
}
|
||||
row += 1;
|
||||
if l.lines.is_empty() {
|
||||
sheet.write_string_with_format(row, 0, EMPTY, &f.sub_label)?;
|
||||
row += 1;
|
||||
}
|
||||
let quiet = Format::new().set_italic().set_font_color("#666666");
|
||||
let quiet_plain = f.plain.clone().set_italic().set_font_color("#666666");
|
||||
for a in &l.lines {
|
||||
let (text, amount) = if a.disposed {
|
||||
(&quiet, &quiet_plain)
|
||||
} else {
|
||||
(&Format::new(), &f.plain)
|
||||
};
|
||||
sheet.write_string_with_format(row, 0, &a.tag, text)?;
|
||||
sheet.write_string_with_format(row, 1, &a.description, text)?;
|
||||
sheet.write_string_with_format(row, 2, &a.serial, text)?;
|
||||
sheet.write_string_with_format(row, 3, &a.in_service, text)?;
|
||||
number(sheet, row, 4, a.cost, amount)?;
|
||||
number(sheet, row, 5, a.salvage, amount)?;
|
||||
sheet.write_number_with_format(
|
||||
row,
|
||||
6,
|
||||
f64::from(a.life_months),
|
||||
&text.clone().set_align(FormatAlign::Right),
|
||||
)?;
|
||||
number(sheet, row, 7, a.accumulated, amount)?;
|
||||
number(sheet, row, 8, a.book_value, amount)?;
|
||||
sheet.write_string_with_format(row, 9, &a.status, text)?;
|
||||
row += 1;
|
||||
}
|
||||
sheet.write_string_with_format(row, 0, "Total, assets held", &f.bold)?;
|
||||
for c in (1..width).filter(|c| ![4, 7, 8].contains(c)) {
|
||||
sheet.write_blank(row, c, &f.dollars_total)?;
|
||||
}
|
||||
for (c, d) in [4u16, 7, 8].into_iter().zip(l.totals) {
|
||||
number(sheet, row, c, d, &f.dollars_total)?;
|
||||
}
|
||||
row += 2;
|
||||
sheet.write_string_with_format(row, 0, "Reconciliation to the books", &f.bold)?;
|
||||
row += 1;
|
||||
for line in &l.reconciliation {
|
||||
let col = match line.column {
|
||||
ReconColumn::Cost => 4,
|
||||
ReconColumn::Accumulated => 7,
|
||||
};
|
||||
let (label_fmt, amount_fmt) = if line.difference {
|
||||
(&f.bold, &f.dollars_sum)
|
||||
} else {
|
||||
(&f.line_label, &f.plain)
|
||||
};
|
||||
sheet.write_string_with_format(row, 0, &line.label, label_fmt)?;
|
||||
number(sheet, row, col, line.amount, amount_fmt)?;
|
||||
row += 1;
|
||||
if line.difference {
|
||||
row += 1;
|
||||
}
|
||||
}
|
||||
for (c, w) in [
|
||||
(0, 12.0),
|
||||
(1, 40.0),
|
||||
(2, 20.0),
|
||||
(3, 12.0),
|
||||
(4, 14.0),
|
||||
(5, 12.0),
|
||||
(6, 9.0),
|
||||
(7, 16.0),
|
||||
(8, 14.0),
|
||||
(9, 34.0),
|
||||
] {
|
||||
sheet.set_column_width(c, w)?;
|
||||
}
|
||||
footer(sheet, &f, meta, row.saturating_sub(1), width)?;
|
||||
Ok(workbook.save_to_buffer()?)
|
||||
}
|
||||
|
||||
static TEMPLATE: &str = include_str!("../templates/asset_register.typ");
|
||||
|
||||
fn engine() -> &'static TypstEngine<TypstTemplateMainFile> {
|
||||
static ENGINE: OnceLock<TypstEngine<TypstTemplateMainFile>> = OnceLock::new();
|
||||
ENGINE.get_or_init(|| {
|
||||
TypstEngine::builder()
|
||||
.main_file(TEMPLATE)
|
||||
.fonts(INTER)
|
||||
.build()
|
||||
})
|
||||
}
|
||||
|
||||
fn amount(d: Decimal) -> serde_json::Value {
|
||||
let p = amount_parts(d);
|
||||
serde_json::json!({ "digits": p.digits, "negative": p.negative })
|
||||
}
|
||||
|
||||
/// The PDF template's input: the layout, every amount split for
|
||||
/// alignment.
|
||||
pub fn template_data(r: &AssetRegister, meta: &ReportMeta) -> serde_json::Value {
|
||||
let l = layout(r);
|
||||
serde_json::json!({
|
||||
"company": meta.company,
|
||||
"title": l.title,
|
||||
"period": l.period,
|
||||
"footer": meta.footer(),
|
||||
"columns": COLUMNS,
|
||||
"empty": EMPTY,
|
||||
"lines": l.lines.iter().map(|a| serde_json::json!({
|
||||
"tag": a.tag,
|
||||
"description": a.description,
|
||||
"serial": a.serial,
|
||||
"in_service": a.in_service,
|
||||
"cost": amount(a.cost),
|
||||
"salvage": amount(a.salvage),
|
||||
"life": a.life_months.to_string(),
|
||||
"accumulated": amount(a.accumulated),
|
||||
"book_value": amount(a.book_value),
|
||||
"status": a.status,
|
||||
"disposed": a.disposed,
|
||||
})).collect::<Vec<_>>(),
|
||||
"totals": l.totals.iter().map(|d| amount(*d)).collect::<Vec<_>>(),
|
||||
"reconciliation": l.reconciliation.iter().map(|x| serde_json::json!({
|
||||
"label": x.label,
|
||||
"amount": amount(x.amount),
|
||||
"difference": x.difference,
|
||||
})).collect::<Vec<_>>(),
|
||||
})
|
||||
}
|
||||
|
||||
/// Typeset the register into a document (pages, before PDF encoding), so
|
||||
/// the layout can be inspected.
|
||||
pub fn typeset_asset_register(
|
||||
r: &AssetRegister,
|
||||
meta: &ReportMeta,
|
||||
) -> Result<PagedDocument, PdfError> {
|
||||
let mut inputs = Dict::new();
|
||||
inputs.insert(
|
||||
"data".into(),
|
||||
template_data(r, meta).to_string().into_value(),
|
||||
);
|
||||
engine()
|
||||
.compile_with_input(inputs)
|
||||
.output
|
||||
.map_err(|e| PdfError::Compile(format!("{e:?}")))
|
||||
}
|
||||
|
||||
/// The fixed asset register as PDF bytes (US Letter, landscape). See the
|
||||
/// module spec.
|
||||
pub fn asset_register_pdf(r: &AssetRegister, meta: &ReportMeta) -> Result<Vec<u8>, PdfError> {
|
||||
let doc = typeset_asset_register(r, meta)?;
|
||||
typst_pdf::pdf(&doc, &typst_pdf::PdfOptions::default())
|
||||
.map_err(|e| PdfError::Save(format!("{e:?}")))
|
||||
}
|
||||
Reference in new issue
Block a user