diff --git a/client b/client index 1821d1fd..455e109f 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit 1821d1fdd5e305c51a76a6cda51a49915ed6ab70 +Subproject commit 455e109f476770d04966802e8272a8bc606e864b diff --git a/common/proto/table_definition.proto b/common/proto/table_definition.proto index a788705d..36d94322 100644 --- a/common/proto/table_definition.proto +++ b/common/proto/table_definition.proto @@ -210,7 +210,7 @@ message ColumnDefinition { // TIME (timezone-free time of day) // MONEY (= unconstrained NUMERIC; currency is declared below) // ACCOUNTING (creates schema-managed name, account, debit, and credit fields; - // account always selects a row from the profile's managed accounts table; + // account always selects a row from the profile's managed ledger_accounts table; // name is limited to 10 characters and one stored row contributes // one line to the profile journal) // ACCOUNTING_TRANSFER (creates automatic source-period/account/book/ diff --git a/common/src/proto/descriptor.bin b/common/src/proto/descriptor.bin index fe53a903..12ce2b91 100644 Binary files a/common/src/proto/descriptor.bin and b/common/src/proto/descriptor.bin differ diff --git a/common/src/proto/komp_ac.table_definition.rs b/common/src/proto/komp_ac.table_definition.rs index 98f0c56e..615930dc 100644 --- a/common/src/proto/komp_ac.table_definition.rs +++ b/common/src/proto/komp_ac.table_definition.rs @@ -170,7 +170,7 @@ pub struct ColumnDefinition { /// TIME (timezone-free time of day) /// MONEY (= unconstrained NUMERIC; currency is declared below) /// ACCOUNTING (creates schema-managed name, account, debit, and credit fields; - /// account always selects a row from the profile's managed accounts table; + /// account always selects a row from the profile's managed ledger_accounts table; /// name is limited to 10 characters and one stored row contributes /// one line to the profile journal) /// ACCOUNTING_TRANSFER (creates automatic source-period/account/book/ diff --git a/server b/server index 1a7b8946..03a8e188 160000 --- a/server +++ b/server @@ -1 +1 @@ -Subproject commit 1a7b8946a2e7fbb3ec57718ee56c17800470129a +Subproject commit 03a8e1887af639bbc582e5583eb72d2967558a88 diff --git a/web/src/pages/add_table/draft.rs b/web/src/pages/add_table/draft.rs index 343ff113..ed1ed4d5 100644 --- a/web/src/pages/add_table/draft.rs +++ b/web/src/pages/add_table/draft.rs @@ -1040,7 +1040,7 @@ mod tests { let error = draft.validate(crate::i18n::Locale::default()).unwrap_err(); assert!(error.contains("38 characters"), "{error}"); - draft.table_name = "accounts".to_string(); + draft.table_name = "ledger_accounts".to_string(); assert!(draft.validate(crate::i18n::Locale::default()).is_err()); draft.table_name = "general_ledger".to_string(); assert!(draft.validate(crate::i18n::Locale::default()).is_err()); diff --git a/web/src/pages/add_table/loader.rs b/web/src/pages/add_table/loader.rs index f8d3886c..0b76930f 100644 --- a/web/src/pages/add_table/loader.rs +++ b/web/src/pages/add_table/loader.rs @@ -98,7 +98,7 @@ pub(crate) async fn load_page( .into_iter() // The profile's ledger accounts are not a link target of their own: an // ACCOUNTING column is how a row is posted to one. - .filter(|table| table.name != crate::schema::ACCOUNTS_TABLE) + .filter(|table| table.name != crate::schema::LEDGER_ACCOUNTS_TABLE) .map(|table| RelationTableOption { name: table.name, global: table.global, diff --git a/web/src/pages/admin/table_definition/state.rs b/web/src/pages/admin/table_definition/state.rs index 668aac7b..b383c842 100644 --- a/web/src/pages/admin/table_definition/state.rs +++ b/web/src/pages/admin/table_definition/state.rs @@ -349,7 +349,7 @@ impl TableDefinitionPageState { /// A table cannot link to itself, and the chart of accounts is reached /// through an ACCOUNTING row rather than through a link of one's own. fn eligible_link_target(&self, table: &TableSummary) -> bool { - table.name != self.selection.table && table.name != crate::schema::ACCOUNTS_TABLE + table.name != self.selection.table && table.name != crate::schema::LEDGER_ACCOUNTS_TABLE } pub(crate) fn global_link_target_tables(&self) -> Vec<&str> { diff --git a/web/src/pages/admin/table_definition/ui.rs b/web/src/pages/admin/table_definition/ui.rs index a7656f22..feda7992 100644 --- a/web/src/pages/admin/table_definition/ui.rs +++ b/web/src/pages/admin/table_definition/ui.rs @@ -268,8 +268,8 @@ mod tests { profile: "billing".to_string(), table: "invoice".to_string(), }, - tables: vec![table("invoice", "dynamic"), table("accounts", "system")], - link_targets: vec![table("invoice", "dynamic"), table("accounts", "system")], + tables: vec![table("invoice", "dynamic"), table("ledger_accounts", "system")], + link_targets: vec![table("invoice", "dynamic"), table("ledger_accounts", "system")], detail: Some(TableDetailView { id: 7, row_version: 1, @@ -398,7 +398,7 @@ mod tests { #[test] fn a_system_table_gets_no_write_form() { let mut state = page(); - state.selection.table = "accounts".to_string(); + state.selection.table = "ledger_accounts".to_string(); let html = render_delete_page(&state); assert!(!html.contains("Template error"), "{html}"); @@ -551,7 +551,7 @@ mod tests { assert!(html.contains(r#""#)); assert!(!html.contains(r#"