The project page opens on a snapshot: revenue, direct costs, the contribution before overhead and its margin of revenue (a segment margin: revenue less every cost traced to the project, fixed and variable; B-37 item 7), in the black or red, and for on-spec work the cost unrecovered if repaid. To date or this fiscal year. By month, revenue and costs with the net to date in its own strip; costs by category; the list colors each net by its sign. books.project carries the same figures, and a parity test runs the viewer and the MCP on the same books to the cent. Tests honor TMPDIR. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01T3gXMVt7XJPi6ens1or9Dj
This commit is contained in:
23 files changed
+2231
-246
No files matched your search
@@ -1002,6 +1002,95 @@ proptest! {
|
||||
prop_assert_eq!(exp_sum + untagged_exp, all.total_expenses);
|
||||
}
|
||||
|
||||
/// rules.md B-37 item 7: the snapshot's contribution is
|
||||
/// project_to_date's net, revenue less direct costs, whatever the
|
||||
/// tags and sides (a refund debits revenue, a reimbursement credits an
|
||||
/// expense below zero): the accounts sum to the totals, each month's
|
||||
/// net to date is project_to_date through its end (the last is the
|
||||
/// net to date), and a margin exists exactly when revenue is above
|
||||
/// zero, with the contribution's sign.
|
||||
#[test]
|
||||
fn prop_project_contribution_is_the_net_to_date(
|
||||
entries in prop::collection::vec(
|
||||
(0u32..400, 1i64..1_000_000, 0u32..4, any::<bool>(), 0u32..3, 0u32..3),
|
||||
0..20,
|
||||
),
|
||||
from in 0u32..400,
|
||||
len in 0u32..400,
|
||||
) {
|
||||
let base = NaiveDate::from_ymd_opt(2026, 1, 1).unwrap();
|
||||
let mut l = Ledger::new(Currency::USD);
|
||||
let cash = l.add_account("1000", "Cash", AccountType::Asset, None, false).unwrap();
|
||||
let rev = l.add_account("4000", "Revenue", AccountType::Revenue, None, false).unwrap();
|
||||
let exp = l.add_account("6000", "Costs", AccountType::Expense, None, false).unwrap();
|
||||
let soft = l.add_account("6100", "Software", AccountType::Expense, None, false).unwrap();
|
||||
let classes: Vec<u32> = (0..2).map(|i| l.add_class(&format!("P{i}")).unwrap()).collect();
|
||||
let accounts = [cash, rev, exp, soft];
|
||||
// Each tagged revenue or expense line: (date, class).
|
||||
let mut tagged = Vec::new();
|
||||
for (day, c, other, debit_first, tag_a, tag_b) in entries {
|
||||
let date = base + chrono::Days::new(u64::from(day));
|
||||
let e = l.create_entry(date, "e");
|
||||
let amt = Money::new(Decimal::new(c, 2), Currency::USD);
|
||||
let other = accounts[other as usize];
|
||||
let (dr, cr) = if debit_first { (other, cash) } else { (cash, other) };
|
||||
l.add_line(e, dr, Side::Debit, amt).unwrap();
|
||||
l.add_line(e, cr, Side::Credit, amt).unwrap();
|
||||
for (i, t) in [tag_a, tag_b].into_iter().enumerate() {
|
||||
if let Some(&k) = classes.get(t as usize) {
|
||||
l.set_line_class(e, i, Some(k)).unwrap();
|
||||
if [dr, cr][i] != cash {
|
||||
tagged.push((date, k));
|
||||
}
|
||||
}
|
||||
}
|
||||
l.post_entry(e).unwrap();
|
||||
}
|
||||
let start = base + chrono::Days::new(u64::from(from));
|
||||
let end = start + chrono::Days::new(u64::from(len));
|
||||
for &k in &classes {
|
||||
let t = ledger_core::project_to_date(&l, k, end).unwrap();
|
||||
let lines = |v: &[ledger_core::StatementLine]| v.iter().map(|x| x.amount).sum::<Decimal>();
|
||||
prop_assert_eq!(lines(&t.revenue_by_account), t.revenue);
|
||||
prop_assert_eq!(lines(&t.expenses_by_account), t.expenses);
|
||||
prop_assert_eq!(t.net(), t.revenue - t.expenses);
|
||||
match t.margin_pct() {
|
||||
None => prop_assert!(t.revenue <= Decimal::ZERO),
|
||||
Some(m) => {
|
||||
prop_assert!(t.revenue > Decimal::ZERO);
|
||||
prop_assert_eq!(m.scale(), 1);
|
||||
// Its sign is the contribution's (a tiny one rounds to 0.0).
|
||||
if t.net() >= Decimal::ZERO {
|
||||
prop_assert!(m >= Decimal::ZERO);
|
||||
} else {
|
||||
prop_assert!(m <= Decimal::ZERO);
|
||||
}
|
||||
}
|
||||
}
|
||||
// Whether anything is tagged counts lines, even ones netting
|
||||
// to zero, never accounts left with a balance.
|
||||
let count = |from: NaiveDate| {
|
||||
tagged.iter().filter(|(d, c)| *c == k && *d >= from && *d <= end).count()
|
||||
};
|
||||
prop_assert_eq!(t.revenue_lines + t.expenses_lines, count(NaiveDate::MIN));
|
||||
let f = ledger_core::project_figures(&l, k, start, end).unwrap();
|
||||
prop_assert_eq!(f.period_lines, count(start));
|
||||
prop_assert_eq!(&f.to_date, &t);
|
||||
prop_assert_eq!(f.months_net_to_date.len(), f.months.len());
|
||||
for (m, running) in f.months.iter().zip(&f.months_net_to_date) {
|
||||
let at = ledger_core::project_to_date(&l, k, m.end).unwrap();
|
||||
prop_assert_eq!(*running, at.net());
|
||||
}
|
||||
if let Some(last) = f.months_net_to_date.last() {
|
||||
prop_assert_eq!(*last, t.net());
|
||||
}
|
||||
prop_assert_eq!(
|
||||
f.period_margin_pct(),
|
||||
ledger_core::contribution_margin_pct(f.period.net_income(), f.period.total_revenue)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// rules.md B-37 item 3: project_entries codes its own signs, so the
|
||||
/// posted entries' project amounts must sum to project_to_date's net
|
||||
/// (with no entry dated after the day), whatever the tags, the sides,
|
||||
|
||||
@@ -510,6 +510,9 @@ fn closing_entries_are_left_out_of_project_figures() {
|
||||
let f = project_figures(&b.l, c, d(2025, 1, 1), d(2025, 12, 31)).unwrap();
|
||||
assert_eq!(f.period.total_revenue, cents(40_000));
|
||||
assert_eq!(f.to_date.revenue, cents(40_000));
|
||||
// The close's lines aren't counted as tagged ones either.
|
||||
assert_eq!((f.to_date.revenue_lines, f.to_date.expenses_lines), (1, 0));
|
||||
assert_eq!(f.period_lines, 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -530,6 +533,23 @@ fn a_reversal_nets_a_project_to_zero() {
|
||||
assert!(t.expenses.is_zero());
|
||||
let entries = project_entries(&b.l, c);
|
||||
assert_eq!(entries, vec![(r, cents(180_000)), (e, cents(-180_000))]);
|
||||
// Nothing left on an account, but two lines tagged: it breaks even,
|
||||
// it isn't untagged (rules.md B-37 item 7).
|
||||
assert!(t.expenses_by_account.is_empty());
|
||||
assert_eq!((t.revenue_lines, t.expenses_lines), (0, 2));
|
||||
assert!(t.any_tagged());
|
||||
let f = project_figures(&b.l, c, d(2026, 1, 1), d(2026, 12, 31)).unwrap();
|
||||
assert_eq!(f.period_lines, 2);
|
||||
// A period before both: nothing there, both still to date.
|
||||
let f = project_figures(&b.l, c, d(2026, 1, 1), d(2026, 2, 28)).unwrap();
|
||||
assert_eq!(f.period_lines, 0);
|
||||
assert!(!f.to_date.any_tagged(), "to date through the period's end");
|
||||
let bare = b.l.add_class("Bare").unwrap();
|
||||
assert!(
|
||||
!project_to_date(&b.l, bare, d(2026, 12, 31))
|
||||
.unwrap()
|
||||
.any_tagged()
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -631,3 +651,64 @@ fn differs_from_names_projects() {
|
||||
a.l.set_project(c, "Harbor", on_spec()).unwrap();
|
||||
assert_eq!(a.l.differs_from(&before), vec!["projects"]);
|
||||
}
|
||||
|
||||
/// rules.md B-37 item 7: the margin is the contribution's share of
|
||||
/// revenue, one place, half to even, and none without revenue.
|
||||
#[test]
|
||||
fn contribution_margin_is_one_place_and_none_without_revenue() {
|
||||
use ledger_core::contribution_margin_pct as pct;
|
||||
assert_eq!(
|
||||
pct(cents(320_000), cents(500_000)).unwrap().to_string(),
|
||||
"64.0"
|
||||
);
|
||||
assert_eq!(pct(cents(100), cents(100)).unwrap().to_string(), "100.0");
|
||||
assert_eq!(pct(cents(-300), cents(200)).unwrap().to_string(), "-150.0");
|
||||
// Half to even: 1.25% to 1.2, 1.35% to 1.4.
|
||||
assert_eq!(pct(cents(125), cents(10_000)).unwrap().to_string(), "1.2");
|
||||
assert_eq!(pct(cents(135), cents(10_000)).unwrap().to_string(), "1.4");
|
||||
assert_eq!(pct(cents(-500), Decimal::ZERO), None);
|
||||
assert_eq!(pct(cents(500), cents(-500)), None, "refunds only");
|
||||
assert_eq!(pct(Decimal::MAX, cents(1)), None, "never panics");
|
||||
}
|
||||
|
||||
/// rules.md B-37 item 7: each month's net to date opens on the lines
|
||||
/// before the months (a deposit last year) and ends on the net to date;
|
||||
/// a reimbursement credited above its cost leaves the expense below zero.
|
||||
#[test]
|
||||
fn months_net_to_date_runs_from_before_the_months() {
|
||||
let mut b = books();
|
||||
let c = b.l.add_class("Zeta site").unwrap();
|
||||
b.post(d(2025, 12, 10), b.cash, b.revenue, 50_000, Some((c, false)));
|
||||
b.post(
|
||||
d(2026, 2, 9),
|
||||
b.contractors,
|
||||
b.cash,
|
||||
20_000,
|
||||
Some((c, true)),
|
||||
);
|
||||
// The client reimburses more than the cost, credited to it.
|
||||
b.post(
|
||||
d(2026, 3, 1),
|
||||
b.cash,
|
||||
b.contractors,
|
||||
30_000,
|
||||
Some((c, false)),
|
||||
);
|
||||
let f = project_figures(&b.l, c, d(2026, 1, 1), d(2026, 3, 31)).unwrap();
|
||||
assert_eq!(
|
||||
f.months_net_to_date,
|
||||
vec![cents(50_000), cents(30_000), cents(60_000)]
|
||||
);
|
||||
assert_eq!(f.to_date.net(), cents(60_000));
|
||||
assert_eq!(f.to_date.expenses, cents(-10_000));
|
||||
assert_eq!(f.to_date.expenses_by_account.len(), 1);
|
||||
assert_eq!(f.to_date.expenses_by_account[0].amount, cents(-10_000));
|
||||
assert_eq!(f.to_date.margin_pct().unwrap().to_string(), "120.0");
|
||||
assert_eq!(f.period_margin_pct(), None, "no revenue in the period");
|
||||
// No entries at all: nothing to date, no margin, every month zero.
|
||||
let empty = b.l.add_class("Empty").unwrap();
|
||||
let f = project_figures(&b.l, empty, d(2026, 1, 1), d(2026, 3, 31)).unwrap();
|
||||
assert!(f.to_date.revenue_by_account.is_empty() && f.to_date.expenses_by_account.is_empty());
|
||||
assert_eq!(f.to_date.margin_pct(), None);
|
||||
assert_eq!(f.months_net_to_date, vec![Decimal::ZERO; 3]);
|
||||
}
|
||||
Reference in new issue
Block a user