merge: P4b S5, sent tracking (branch S5, ad649be3)
The second of the paused branches. invoice.sent, Ledger::mark_sent (with its Lean step), books.mark_sent in its own group, the two attention items, schema 17. Conflicts, resolved as plan 8.0.2 says: the shared over-the-wire test file crates/ledger-cli/tests/documents.rs (S4.4's file kept whole, S5's test appended, its create call given the confirmed: true the S4.4 contract now needs), types.rs (both appends kept), docs/parity.md (the review's oracle row and S5's new row). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01HS8WZziDnyxunC23MUxrLp
This commit is contained in:
commit
3a3f03d884
44 files changed
+1847
-30
No files matched your search
@@ -984,7 +984,13 @@ impl BooksServer {
|
||||
}
|
||||
let store = self.lock()?;
|
||||
let ledger = store.ledger();
|
||||
let docs: Vec<(ledger_core::DocRef, String, NaiveDate, NaiveDate)> = if invoices {
|
||||
let docs: Vec<(
|
||||
ledger_core::DocRef,
|
||||
String,
|
||||
NaiveDate,
|
||||
NaiveDate,
|
||||
Option<String>,
|
||||
)> = if invoices {
|
||||
ledger
|
||||
.invoices()
|
||||
.into_iter()
|
||||
@@ -993,7 +999,13 @@ impl BooksServer {
|
||||
.get_customer(i.customer_id)
|
||||
.map(|c| c.name.clone())
|
||||
.unwrap_or_default();
|
||||
(ledger_core::DocRef::Invoice(i.id), who, i.date, i.due_date)
|
||||
(
|
||||
ledger_core::DocRef::Invoice(i.id),
|
||||
who,
|
||||
i.date,
|
||||
i.due_date,
|
||||
last_sent(&i.sends),
|
||||
)
|
||||
})
|
||||
.collect()
|
||||
} else {
|
||||
@@ -1005,14 +1017,20 @@ impl BooksServer {
|
||||
.get_vendor(b.vendor_id)
|
||||
.map(|v| v.name.clone())
|
||||
.unwrap_or_default();
|
||||
(ledger_core::DocRef::Bill(b.id), who, b.date, b.due_date)
|
||||
(
|
||||
ledger_core::DocRef::Bill(b.id),
|
||||
who,
|
||||
b.date,
|
||||
b.due_date,
|
||||
None,
|
||||
)
|
||||
})
|
||||
.collect()
|
||||
};
|
||||
let party = p.party.as_deref().map(|s| s.trim().to_lowercase());
|
||||
let mut rows = Vec::new();
|
||||
let mut owed = Decimal::ZERO;
|
||||
for (doc, who, date, due) in docs {
|
||||
for (doc, who, date, due, last_sent) in docs {
|
||||
if let Some(want_party) = &party
|
||||
&& who.to_lowercase() != *want_party
|
||||
&& doc_id(doc).to_string() != *want_party
|
||||
@@ -1050,6 +1068,7 @@ impl BooksServer {
|
||||
outstanding: money(st.outstanding),
|
||||
status: key.to_string(),
|
||||
overdue_days: st.overdue_days,
|
||||
last_sent,
|
||||
},
|
||||
));
|
||||
}
|
||||
@@ -1080,7 +1099,7 @@ impl BooksServer {
|
||||
let doc = parse_doc_ref(&p.r#ref)?;
|
||||
let store = self.lock()?;
|
||||
let ledger = store.ledger();
|
||||
let (who, date, due, entry_id, lines) = match doc {
|
||||
let (who, date, due, entry_id, lines, sends) = match doc {
|
||||
ledger_core::DocRef::Invoice(id) => {
|
||||
let i = ledger
|
||||
.get_invoice(id)
|
||||
@@ -1089,7 +1108,14 @@ impl BooksServer {
|
||||
.get_customer(i.customer_id)
|
||||
.map(|c| c.name.clone())
|
||||
.unwrap_or_default();
|
||||
(who, i.date, i.due_date, i.entry_id, i.lines.clone())
|
||||
(
|
||||
who,
|
||||
i.date,
|
||||
i.due_date,
|
||||
i.entry_id,
|
||||
i.lines.clone(),
|
||||
i.sends.iter().map(sent_out).collect(),
|
||||
)
|
||||
}
|
||||
ledger_core::DocRef::Bill(id) => {
|
||||
let b = ledger
|
||||
@@ -1099,7 +1125,14 @@ impl BooksServer {
|
||||
.get_vendor(b.vendor_id)
|
||||
.map(|v| v.name.clone())
|
||||
.unwrap_or_default();
|
||||
(who, b.date, b.due_date, b.entry_id, b.lines.clone())
|
||||
(
|
||||
who,
|
||||
b.date,
|
||||
b.due_date,
|
||||
b.entry_id,
|
||||
b.lines.clone(),
|
||||
Vec::new(),
|
||||
)
|
||||
}
|
||||
};
|
||||
let st = ledger
|
||||
@@ -1171,6 +1204,7 @@ impl BooksServer {
|
||||
status: st.status.key().to_string(),
|
||||
overdue_days: st.overdue_days,
|
||||
timeline,
|
||||
sends,
|
||||
pdf,
|
||||
}))
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user