diff --git a/src/gnome-utils/glade/preferences.glade b/src/gnome-utils/glade/preferences.glade index bf18783c9d..de4fd4a105 100644 --- a/src/gnome-utils/glade/preferences.glade +++ b/src/gnome-utils/glade/preferences.glade @@ -2535,7 +2535,7 @@ 6 True - 14 + 15 4 False 0 @@ -2694,8 +2694,8 @@ 0 1 - 8 - 9 + 9 + 10 fill @@ -2773,6 +2773,30 @@ + + + True + Always open the reconcile dialog using today's date for the statement date, regardless of previous reconciliations. + True + Always reconcile to t_oday + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + 4 + 8 + 9 + 12 + fill + + + + True @@ -2789,8 +2813,8 @@ 0 4 - 13 - 14 + 14 + 15 12 fill @@ -2813,8 +2837,8 @@ 0 4 - 12 - 13 + 13 + 14 12 fill @@ -2837,8 +2861,8 @@ 0 4 - 11 - 12 + 12 + 13 12 fill @@ -2861,8 +2885,8 @@ 0 4 - 10 - 11 + 11 + 12 12 fill @@ -2890,8 +2914,8 @@ 0 2 - 9 - 10 + 10 + 11 fill diff --git a/src/gnome/schemas/apps_gnucash_dialog_reconcile.schemas.in b/src/gnome/schemas/apps_gnucash_dialog_reconcile.schemas.in index e14e186c17..1899564c6e 100644 --- a/src/gnome/schemas/apps_gnucash_dialog_reconcile.schemas.in +++ b/src/gnome/schemas/apps_gnucash_dialog_reconcile.schemas.in @@ -53,5 +53,21 @@ + + /schemas/apps/gnucash/dialogs/reconcile/always_reconcile_to_today + /apps/gnucash/dialogs/reconcile/always_reconcile_to_today + gnucash + bool + FALSE + + Always reconcile to today + + If active, always open the reconcile dialog using today's + date for the statement date, regardless of previous + reconciliations. + + + + diff --git a/src/gnome/window-reconcile.c b/src/gnome/window-reconcile.c index c7393c54ec..66192a53ea 100644 --- a/src/gnome/window-reconcile.c +++ b/src/gnome/window-reconcile.c @@ -1329,13 +1329,18 @@ gnc_get_reconcile_info (Account *account, gnc_numeric *new_ending, time_t *statement_date) { + gboolean always_today; GDate date; time_t today; struct tm tm; g_date_clear(&date, 1); - if (xaccAccountGetReconcileLastDate (account, statement_date)) + always_today = gnc_gconf_get_bool(GCONF_RECONCILE_SECTION, + "always_reconcile_to_today", NULL); + + if (!always_today && + xaccAccountGetReconcileLastDate (account, statement_date)) { int months = 1, days = 0;