mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Bug 783283 - Multi-Currency payments use wrong date
Also properly handles the user clicking the cancel button on the transfer dialog It will now just return to the payment window, waiting for further user input.
This commit is contained in:
parent
5bf3bfc6b6
commit
f91b35b444
@ -1004,6 +1004,7 @@ gnc_payment_ok_cb (G_GNUC_UNUSED GtkWidget *widget, gpointer data)
|
|||||||
|
|
||||||
gnc_xfer_dialog_select_to_account(xfer, pw->xfer_acct);
|
gnc_xfer_dialog_select_to_account(xfer, pw->xfer_acct);
|
||||||
gnc_xfer_dialog_set_amount(xfer, pw->amount_tot);
|
gnc_xfer_dialog_set_amount(xfer, pw->amount_tot);
|
||||||
|
gnc_xfer_dialog_set_date (xfer, t);
|
||||||
|
|
||||||
/* All we want is the exchange rate so prevent the user from thinking
|
/* All we want is the exchange rate so prevent the user from thinking
|
||||||
it makes sense to mess with other stuff */
|
it makes sense to mess with other stuff */
|
||||||
@ -1012,7 +1013,9 @@ gnc_payment_ok_cb (G_GNUC_UNUSED GtkWidget *widget, gpointer data)
|
|||||||
gnc_xfer_dialog_hide_from_account_tree(xfer);
|
gnc_xfer_dialog_hide_from_account_tree(xfer);
|
||||||
gnc_xfer_dialog_hide_to_account_tree(xfer);
|
gnc_xfer_dialog_hide_to_account_tree(xfer);
|
||||||
gnc_xfer_dialog_is_exchange_dialog(xfer, &exch);
|
gnc_xfer_dialog_is_exchange_dialog(xfer, &exch);
|
||||||
gnc_xfer_dialog_run_until_done(xfer);
|
|
||||||
|
if (!gnc_xfer_dialog_run_until_done(xfer))
|
||||||
|
return; /* If the user cancels, return to the payment dialog without changes */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Perform the payment */
|
/* Perform the payment */
|
||||||
|
Loading…
Reference in New Issue
Block a user