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

Merge Bob Fewell's 'fixes6' into maint.

Browse Source
This commit is contained in:
John Ralls 2018-06-12 16:12:48 -07:00
commit 9c7fa77d3b
4 changed files with 115 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
gnucash/gnome-utils/dialog-utils.c
View File

@ -39,6 +39,7 @@
#include "gnc-path.h"
#include "gnc-engine.h"
#include "gnc-euro.h"
#include "gnc-ui.h"
#include "gnc-ui-util.h"
#include "gnc-prefs.h"
#include "gnc-combott.h"
@ -325,6 +326,55 @@ gnc_draw_arrow_cb (GtkWidget *widget, cairo_t *cr, gpointer direction)
}
gboolean
gnc_gdate_in_valid_range (GDate *test_date, gboolean warn)
{
gboolean use_autoreadonly = qof_book_uses_autoreadonly (gnc_get_current_book());
GDate *max_date = g_date_new_dmy (1,1,10000);
GDate *min_date;
gboolean ret = FALSE;
gboolean max_date_ok = FALSE;
gboolean min_date_ok = FALSE;
if (use_autoreadonly)
min_date = qof_book_get_autoreadonly_gdate (gnc_get_current_book());
else
min_date = g_date_new_dmy (1,1,1400);
// max date
if (g_date_compare (max_date, test_date) > 0)
max_date_ok = TRUE;
// min date
if (g_date_compare (min_date, test_date) <= 0)
min_date_ok = TRUE;
if (use_autoreadonly && warn)
ret = max_date_ok;
else
ret = min_date_ok & max_date_ok;
if (warn && !ret)
{
gchar *dialog_msg = _("The entered date is out of the range "
"01/01/1400 - 31/12/9999, resetting to this year");
gchar *dialog_title = _("Date out of range");
GtkWidget *dialog = gtk_message_dialog_new (gnc_ui_get_main_window (NULL),
0,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
"%s", dialog_title);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(dialog),
"%s", dialog_msg);
gtk_dialog_run (GTK_DIALOG(dialog));
gtk_widget_destroy (dialog);
}
g_date_free (max_date);
g_date_free (min_date);
return ret;
}
gboolean
gnc_handle_date_accelerator (GdkEventKey *event,
struct tm *tm,
@ -368,7 +418,9 @@ gnc_handle_date_accelerator (GdkEventKey *event,
g_date_add_years (&gdate, 1);
else
g_date_add_days (&gdate, 1);
g_date_to_struct_tm (&gdate, tm);
if (gnc_gdate_in_valid_range (&gdate, FALSE))
g_date_to_struct_tm (&gdate, tm);
return TRUE;
case GDK_KEY_minus:
@ -402,7 +454,9 @@ gnc_handle_date_accelerator (GdkEventKey *event,
g_date_subtract_years (&gdate, 1);
else
g_date_subtract_days (&gdate, 1);
g_date_to_struct_tm (&gdate, tm);
if (gnc_gdate_in_valid_range (&gdate, FALSE))
g_date_to_struct_tm (&gdate, tm);
return TRUE;
default:
@ -472,8 +526,8 @@ gnc_handle_date_accelerator (GdkEventKey *event,
default:
return FALSE;
}
g_date_to_struct_tm (&gdate, tm);
if (gnc_gdate_in_valid_range (&gdate, FALSE))
g_date_to_struct_tm (&gdate, tm);
return TRUE;
}

2
gnucash/gnome-utils/dialog-utils.h
View File

@ -98,6 +98,8 @@ void gnc_widget_set_style_context (GtkWidget *widget, const char *gnc_class);
\********************************************************************/
gboolean gnc_draw_arrow_cb (GtkWidget *widget, cairo_t *cr, gpointer direction);
gboolean gnc_gdate_in_valid_range (GDate *test_date, gboolean warn);
gboolean gnc_handle_date_accelerator (GdkEventKey *event,
struct tm *tm,
const char *date_str);

91
gnucash/register/register-gnome/datecell-gnome.c
View File

@ -41,6 +41,7 @@
#include "datecell.h"
#include "dialog-utils.h"
#include "gnc-ui.h"
#include "gnc-ui-util.h"
#include "gnucash-date-picker.h"
#include "gnucash-item-edit.h"
@ -92,44 +93,46 @@ static gboolean gnc_date_cell_enter (BasicCell *bcell,
static void gnc_date_cell_leave (BasicCell *bcell);
static gboolean
check_readonly_threshold (const gchar *datestr, GDate *d)
check_readonly_threshold (const gchar *datestr, GDate *d, gboolean warn)
{
GDate *readonly_threshold = qof_book_get_autoreadonly_gdate(gnc_get_current_book());
if (g_date_compare(d, readonly_threshold) < 0)
{
#if 0
gchar *dialog_msg = _("The entered date of the new transaction is "
"older than the \"Read-Only Threshold\" set for "
"this book. This setting can be changed in "
"File -> Properties -> Accounts.");
gchar *dialog_title = _("Cannot store a transaction at this date");
GtkWidget *dialog = gtk_message_dialog_new(NULL,
0,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
"%s", dialog_title);
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
"%s", dialog_msg);
gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
#endif
g_warning("Entered date %s is before the \"auto-read-only threshold\";"
" resetting to the threshold.", datestr);
if (warn)
{
gchar *dialog_msg = _("The entered date of the transaction is "
"older than the \"Read-Only Threshold\" set for "
"this book. This setting can be changed in "
"File -> Properties -> Accounts, resetting to the threshold.");
gchar *dialog_title = _("Cannot store a transaction at this date");
GtkWidget *dialog = gtk_message_dialog_new(gnc_ui_get_main_window (NULL),
0,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
"%s", dialog_title);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(dialog),
"%s", dialog_msg);
gtk_dialog_run (GTK_DIALOG(dialog));
gtk_widget_destroy (dialog);
// Reset the date to the threshold date
g_date_set_julian (d, g_date_get_julian (readonly_threshold));
g_date_free (readonly_threshold);
return TRUE;
// g_warning("Entered date %s is before the \"auto-read-only threshold\";"
// " resetting to the threshold.", datestr);
}
// Reset the date to the threshold date
g_date_set_julian (d, g_date_get_julian (readonly_threshold));
g_date_free (readonly_threshold);
return TRUE;
}
g_date_free (readonly_threshold);
return FALSE;
}
static void
gnc_parse_date (struct tm *parsed, const char * datestr)
gnc_parse_date (struct tm *parsed, const char * datestr, gboolean warn)
{
int day, month, year;
gboolean use_autoreadonly = qof_book_uses_autoreadonly(gnc_get_current_book());
GDate *test_date;
if (!parsed) return;
if (!datestr) return;
@ -139,26 +142,36 @@ gnc_parse_date (struct tm *parsed, const char * datestr)
// Couldn't parse date, use today
struct tm tm_today;
memset (&tm_today, 0, sizeof (struct tm));
memset (&tm_today, 0, sizeof (struct tm));
gnc_tm_get_today_start (&tm_today);
day = tm_today.tm_mday;
month = tm_today.tm_mon + 1;
year = tm_today.tm_year + 1900;
}
test_date = g_date_new_dmy (day, month, year);
if (!gnc_gdate_in_valid_range (test_date, warn))
{
struct tm tm_today;
memset (&tm_today, 0, sizeof (struct tm));
gnc_tm_get_today_start (&tm_today);
year = tm_today.tm_year + 1900;
}
// If we have an auto-read-only threshold, do not accept a date that is
// older than the threshold.
if (use_autoreadonly)
{
GDate *d = g_date_new_dmy(day, month, year);
if (check_readonly_threshold (datestr, d))
{
day = g_date_get_day (d);
month = g_date_get_month (d);
year = g_date_get_year (d);
}
g_date_free (d);
g_date_set_dmy (test_date, day, month, year);
if (check_readonly_threshold (datestr, test_date, warn))
{
day = g_date_get_day (test_date);
month = g_date_get_month (test_date);
year = g_date_get_year (test_date);
}
}
g_date_free (test_date);
parsed->tm_mday = day;
parsed->tm_mon = month - 1;
@ -452,7 +465,7 @@ gnc_date_cell_commit (DateCell *cell)
if (!cell)
return;
gnc_parse_date (&(box->date), cell->cell.value);
gnc_parse_date (&(box->date), cell->cell.value, FALSE);
qof_print_date_dmy_buff (buff, MAX_DATE_LENGTH,
box->date.tm_mday,
@ -581,9 +594,8 @@ gnc_date_cell_modify_verify (BasicCell *_cell,
/* keep a copy of the new value */
if (accept)
{
gnc_basic_cell_set_value_internal (&cell->cell, newval);
gnc_parse_date (&(box->date), newval);
gnc_parse_date (&(box->date), newval, FALSE);
if (!box->date_picker)
return;
@ -710,7 +722,7 @@ gnc_date_cell_get_date_gdate (DateCell *cell, GDate *date)
if (!cell || !date)
return;
gnc_parse_date (&(box->date), cell->cell.value);
gnc_parse_date (&(box->date), cell->cell.value, FALSE);
g_date_set_dmy(date,
box->date.tm_mday,
@ -724,7 +736,8 @@ gnc_date_cell_get_date (DateCell *cell, time64 *time)
PopBox *box = cell->cell.gui_private;
if (!cell || !time)
return;
gnc_parse_date (&(box->date), cell->cell.value);
gnc_parse_date (&(box->date), cell->cell.value, TRUE);
*time = gnc_mktime (&box->date);
}
@ -735,7 +748,7 @@ gnc_date_cell_set_value_internal (BasicCell *_cell, const char *str)
PopBox *box = cell->cell.gui_private;
char buff[DATE_BUF];
gnc_parse_date (&(box->date), str);
gnc_parse_date (&(box->date), str, FALSE);
qof_print_date_dmy_buff (buff, MAX_DATE_LENGTH,
box->date.tm_mday,

3
libgnucash/engine/gnc-date.cpp
View File

@ -936,6 +936,9 @@ qof_scan_date_internal (const char *buff, int *day, int *month, int *year,
g_free (dupe);
if ((imonth == 0) || (iday == 0))
return FALSE;
if ((12 < imonth) || (31 < iday))
{
/*