IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

[stock-txn-asst] create_transaction() returns <bool,Transaction*>

Browse Source 
This reverts commit 67515497f7.

Because the Transaction* is used in the tests. Also it's a possible
enhancement that the register will jump to the newly created
transaction when the assistant completes.
This commit is contained in:
Christopher Lam 2023-06-30 19:18:03 +08:00
parent 5e376265e4
commit c313c3dedf
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnucash/gnome/assistant-stock-transaction.cpp
View File

@ -736,7 +736,7 @@ struct StockAssistantModel
std::string get_new_amount_str (); std::string get_new_amount_str ();
std::tuple<bool, gnc_numeric, const char*> calculate_price (); std::tuple<bool, gnc_numeric, const char*> calculate_price ();
std::tuple<bool, std::string, SplitInfoVec> generate_list_of_splits (); std::tuple<bool, std::string, SplitInfoVec> generate_list_of_splits ();
bool create_transaction (); std::tuple<bool, Transaction*> create_transaction ();
private: private:
std::optional<time64> m_txn_types_date; std::optional<time64> m_txn_types_date;
@ -1044,13 +1044,13 @@ StockAssistantModel::generate_list_of_splits() {
return { m_ready_to_create, summary_message(), m_list_of_splits }; return { m_ready_to_create, summary_message(), m_list_of_splits };
} }
bool std::tuple<bool, Transaction*>
StockAssistantModel::create_transaction () StockAssistantModel::create_transaction ()
{ {
if (!m_ready_to_create) if (!m_ready_to_create)
{ {
PERR ("errors exist. cannot create transaction."); PERR ("errors exist. cannot create transaction.");
return false; return {false, nullptr};
} }
auto book = qof_instance_get_book (m_acct); auto book = qof_instance_get_book (m_acct);
auto trans = xaccMallocTransaction (book); auto trans = xaccMallocTransaction (book);
@ -1065,7 +1065,7 @@ StockAssistantModel::create_transaction ()
xaccTransCommitEdit (trans); xaccTransCommitEdit (trans);
std::for_each (accounts.begin(), accounts.end(), xaccAccountCommitEdit); std::for_each (accounts.begin(), accounts.end(), xaccAccountCommitEdit);
m_ready_to_create = false; m_ready_to_create = false;
return true; return {true, trans};
} }
void void
@ -2020,10 +2020,9 @@ stock_assistant_finish_cb (GtkAssistant *assistant, gpointer user_data)
g_return_if_fail (info->model->m_txn_type); g_return_if_fail (info->model->m_txn_type);
gnc_suspend_gui_refresh (); gnc_suspend_gui_refresh ();
auto success = info->model->create_transaction(); [[maybe_unused]] auto [success, trans] = info->model->create_transaction();
gnc_resume_gui_refresh (); gnc_resume_gui_refresh ();
if (success)
gnc_close_gui_component_by_data (ASSISTANT_STOCK_TRANSACTION_CM_CLASS, info); gnc_close_gui_component_by_data (ASSISTANT_STOCK_TRANSACTION_CM_CLASS, info);
} }