Adding bill term time64 function

pull/259/merge
lmat 8 years ago committed by Christopher Lam
parent 6dc982c2c6
commit e6ee060121

@ -92,7 +92,7 @@ gnc_dialog_date_close_ok_cb (GtkWidget *widget, gpointer user_data)
if (ddc->date) if (ddc->date)
{ {
if (ddc->terms) if (ddc->terms)
*(ddc->ts) = gncBillTermComputeDueDate (ddc->terms, *(ddc->ts2)); ddc->ts->tv_sec = gncBillTermComputeDueDate (ddc->terms, ddc->ts2->tv_sec);
else else
*(ddc->ts) = gnc_date_edit_get_date_ts (GNC_DATE_EDIT (ddc->date)); *(ddc->ts) = gnc_date_edit_get_date_ts (GNC_DATE_EDIT (ddc->date));
} }
@ -185,10 +185,10 @@ post_date_changed_cb (GNCDateEdit *gde, gpointer d)
{ {
DialogDateClose *ddc = d; DialogDateClose *ddc = d;
Timespec post_date; Timespec post_date;
Timespec due_date; Timespec due_date = {0,0};
post_date = gnc_date_edit_get_date_ts (gde); post_date = gnc_date_edit_get_date_ts (gde);
due_date = gncBillTermComputeDueDate (ddc->terms, post_date); due_date.tv_sec = gncBillTermComputeDueDate (ddc->terms, post_date.tv_sec);
gnc_date_edit_set_time_ts (GNC_DATE_EDIT (ddc->date), due_date); gnc_date_edit_set_time_ts (GNC_DATE_EDIT (ddc->date), due_date);
} }

@ -820,14 +820,14 @@ compute_time (const GncBillTerm *term, Timespec post_date, int days)
return res; return res;
} }
Timespec time64
gncBillTermComputeDueDate (const GncBillTerm *term, Timespec post_date) gncBillTermComputeDueDate (const GncBillTerm *term, time64 post_date)
{ {
Timespec res = post_date; Timespec pass = {post_date, 0};
if (!term) return res; if (!term) return post_date;
return compute_time (term, pass, term->due_days).tv_sec;
return compute_time (term, post_date, term->due_days);
} }
/* Package-Private functions */ /* Package-Private functions */
static void _gncBillTermCreate (QofBook *book) static void _gncBillTermCreate (QofBook *book)

@ -164,7 +164,7 @@ gboolean gncBillTermIsFamily (const GncBillTerm *a, const GncBillTerm *b);
/* functions to compute dates from Bill Terms */ /* functions to compute dates from Bill Terms */
/* Compute the due date and discount dates from the post date */ /* Compute the due date and discount dates from the post date */
Timespec gncBillTermComputeDueDate (const GncBillTerm *term, Timespec post_date); time64 gncBillTermComputeDueDate (const GncBillTerm *term, time64 post_date);
/* deprecated */ /* deprecated */
#define gncBillTermGetGUID(x) qof_instance_get_guid (QOF_INSTANCE(x)) #define gncBillTermGetGUID(x) qof_instance_get_guid (QOF_INSTANCE(x))

Loading…
Cancel
Save