diff --git a/client b/client index 4a6fba3..9f68031 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit 4a6fba395ae266e7ad8f4ffeeb959b6d91309eee +Subproject commit 9f68031ff4259e4a616a2103c42b37a240f2c6fd diff --git a/common/proto/table_definition.proto b/common/proto/table_definition.proto index 11eb568..9f29788 100644 --- a/common/proto/table_definition.proto +++ b/common/proto/table_definition.proto @@ -55,10 +55,6 @@ message TableLink { // Otherwise the column allows NULL. // Duplicate links to the same target table in one request are rejected. bool required = 2; - - // User-defined column read from this linked row as the journal account. - // Exactly one required link must set this when the table contains ACCOUNTING. - string account_value_column = 3; } // Defines the input for creating a new table definition. @@ -183,9 +179,8 @@ message ColumnDefinition { // TIME (timezone-free time of day) // MONEY (= unconstrained NUMERIC; currency comes from the table) // ACCOUNTING (creates schema-managed name, debit, and credit columns; - // the table creator must separately provide a column named account - // with any supported type or a required link to a table named account; - // linked accounts post the linked row's configured display value; + // automatically creates a required accounts_id link and posts + // the referenced canonical account row's account value; // name is limited to 10 characters and one stored row contributes // one line to the profile journal) // INT diff --git a/common/src/proto/descriptor.bin b/common/src/proto/descriptor.bin index fc0fd3c..2530afc 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 49308ec..7b376a7 100644 --- a/common/src/proto/komp_ac.table_definition.rs +++ b/common/src/proto/komp_ac.table_definition.rs @@ -13,10 +13,6 @@ pub struct TableLink { /// Duplicate links to the same target table in one request are rejected. #[prost(bool, tag = "2")] pub required: bool, - /// User-defined column read from this linked row as the journal account. - /// Exactly one required link must set this when the table contains ACCOUNTING. - #[prost(string, tag = "3")] - pub account_value_column: ::prost::alloc::string::String, } /// Defines the input for creating a new table definition. #[derive(serde::Serialize, serde::Deserialize)] @@ -154,9 +150,8 @@ pub struct ColumnDefinition { /// TIME (timezone-free time of day) /// MONEY (= unconstrained NUMERIC; currency comes from the table) /// ACCOUNTING (creates schema-managed name, debit, and credit columns; - /// the table creator must separately provide a column named account - /// with any supported type or a required link to a table named account; - /// linked accounts post the linked row's configured display value; + /// automatically creates a required accounts_id link and posts + /// the referenced canonical account row's account value; /// name is limited to 10 characters and one stored row contributes /// one line to the profile journal) /// INT diff --git a/graphs/src/pages/add_table/state.rs b/graphs/src/pages/add_table/state.rs index 2d2b795..3fda684 100644 --- a/graphs/src/pages/add_table/state.rs +++ b/graphs/src/pages/add_table/state.rs @@ -93,7 +93,6 @@ impl CreateTableForm { .map(|linked_table_name| TableLink { linked_table_name, required: true, - account_value_column: String::new(), }) .collect::>(); links.extend( @@ -102,7 +101,6 @@ impl CreateTableForm { .map(|linked_table_name| TableLink { linked_table_name, required: false, - account_value_column: String::new(), }), ); diff --git a/server b/server index 2b4dfbf..8dd5dcb 160000 --- a/server +++ b/server @@ -1 +1 @@ -Subproject commit 2b4dfbf8ffc96bb697cd28feff1d47afbb8996e2 +Subproject commit 8dd5dcbdcb306e2371e6aee1c39edd2bb9f8213f