aherman
/
gnucash
mirror of https://github.com/Gnucash/gnucash
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use gnc_numerics in reconcile window.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@3133 57a11ea4-9604-0410-9ed3-97b8803252fd
zzzoldreleases/1.6
Dave Peticolas 26 years ago
parent 39ab0baea8
commit b126284b55
4 changed files with 124 additions and 131 deletions
Show Stats Download Patch File Download Diff File

4
src/gnome/dialog-transfer.c
Unescape View File

@ -426,9 +426,9 @@ gnc_xfer_amount_update_cb(GtkWidget *widget, GdkEventFocus *event,
account = to;
currency = xaccAccountGetCurrency(account);
gnc_amount_edit_evaluate (GNC_AMOUNT_EDIT (xferData->amount_edit));
if((from != NULL) && (to != NULL))
{
if(!xaccAccountsHaveCommonCurrency(from, to))

41
src/gnome/reconcile-list.c
Unescape View File

@ -117,10 +117,10 @@ gnc_reconcile_list_new(Account *account, GNCReconcileListType type)
if (type == RECLIST_CREDIT)
DxaccQueryAddAmountMatch(list->query, 0.0, AMT_SGN_MATCH_CREDIT,
AMT_MATCH_ATLEAST, QUERY_AND);
AMT_MATCH_ATLEAST, QUERY_AND);
else
DxaccQueryAddAmountMatch(list->query, 0.0, AMT_SGN_MATCH_DEBIT,
AMT_MATCH_ATLEAST, QUERY_AND);
AMT_MATCH_ATLEAST, QUERY_AND);
return GTK_WIDGET(list);
}
@ -485,22 +485,24 @@ gnc_reconcile_list_refresh(GNCReconcileList *list)
* returns the reconciled balance of the list *
* *
* Args: list - list to get reconciled balance of *
* Returns: reconciled balance (double) *
* Returns: reconciled balance (gnc_numeric) *
\********************************************************************/
double
gnc_numeric
gnc_reconcile_list_reconciled_balance(GNCReconcileList *list)
{
GtkCList *clist = GTK_CLIST(list);
Split *split;
double total = 0.0;
gnc_numeric total;
int account_type;
int i;
g_return_val_if_fail(list != NULL, 0.0);
g_return_val_if_fail(IS_GNC_RECONCILE_LIST(list), 0.0);
total = gnc_numeric_zero ();
g_return_val_if_fail(list != NULL, total);
g_return_val_if_fail(IS_GNC_RECONCILE_LIST(list), total);
if (list->reconciled == NULL)
return 0.0;
return total;
account_type = xaccAccountGetType(list->account);
@ -513,12 +515,12 @@ gnc_reconcile_list_reconciled_balance(GNCReconcileList *list)
if ((account_type == STOCK) || (account_type == MUTUAL) ||
(account_type == CURRENCY))
total += DxaccSplitGetShareAmount(split);
total = gnc_numeric_add_fixed (total, xaccSplitGetShareAmount(split));
else
total += DxaccSplitGetValue(split);
total = gnc_numeric_add_fixed (total, xaccSplitGetValue(split));
}
return ABS(total);
return gnc_numeric_abs (total);
}
@ -634,7 +636,7 @@ gnc_reconcile_list_fill(GNCReconcileList *list)
Split **splits;
Split *split;
double amount;
gnc_numeric amount;
char recn;
int row;
@ -658,13 +660,13 @@ gnc_reconcile_list_fill(GNCReconcileList *list)
continue;
if((account_type == STOCK) || (account_type == MUTUAL))
amount = DxaccSplitGetShareAmount(split);
amount = xaccSplitGetShareAmount(split);
else
amount = DxaccSplitGetValue(split);
amount = xaccSplitGetValue(split);
if ((amount < 0) && (list->list_type == RECLIST_DEBIT))
if (gnc_numeric_negative_p (amount) && list->list_type == RECLIST_DEBIT)
continue;
if ((amount >= 0) && (list->list_type == RECLIST_CREDIT))
if (!gnc_numeric_negative_p (amount) && list->list_type == RECLIST_CREDIT)
continue;
trans = xaccSplitGetParent(split);
@ -674,11 +676,14 @@ gnc_reconcile_list_fill(GNCReconcileList *list)
strings[0] = gnc_print_date(ts);
strings[1] = xaccTransGetNum(trans);
strings[2] = xaccTransGetDescription(trans);
strings[3] = DxaccPrintAmount(ABS(amount), print_info);
strings[3] = xaccPrintAmount(gnc_numeric_abs (amount), print_info);
reconciled = g_hash_table_lookup(list->reconciled, split) != NULL;
recn = reconciled ? YREC : recn;
strings[4] = gnc_get_reconcile_str(recn);
if (recn == NREC)
strings[4] = "";
else
strings[4] = gnc_get_reconcile_str(recn);
row = gtk_clist_append(GTK_CLIST(list), (gchar **) strings);
gtk_clist_set_row_data(GTK_CLIST(list), row, split);

3
src/gnome/reconcile-list.h
Unescape View File

@ -26,6 +26,7 @@
#include <gtk/gtkclist.h>
#include "Query.h"
#include "gnc-numeric.h"
#ifdef __cplusplus
extern "C" {
@ -97,7 +98,7 @@ Split * gnc_reconcile_list_get_current_split(GNCReconcileList *list);
void gnc_reconcile_list_refresh (GNCReconcileList *list);
double gnc_reconcile_list_reconciled_balance(GNCReconcileList *list);
gnc_numeric gnc_reconcile_list_reconciled_balance(GNCReconcileList *list);
void gnc_reconcile_list_commit(GNCReconcileList *list, time_t date);

207
src/gnome/window-reconcile.c
Unescape View File

@ -33,34 +33,35 @@
#include <stdio.h>
#include <gnome.h>
#include "gnc-ui.h"
#include "MultiLedger.h"
#include "AccWindow.h"
#include "MainWindow.h"
#include "MultiLedger.h"
#include "Refresh.h"
#include "RegWindow.h"
#include "window-reconcile.h"
#include "window-register.h"
#include "Scrub.h"
#include "date.h"
#include "dialog-transfer.h"
#include "dialog-utils.h"
#include "reconcile-list.h"
#include "global-options.h"
#include "gnc-amount-edit.h"
#include "gnc-dateedit.h"
#include "Refresh.h"
#include "query-user.h"
#include "window-help.h"
#include "messages.h"
#include "guile-util.h"
#include "AccWindow.h"
#include "Scrub.h"
#include "gnc-engine-util.h"
#include "gnc-ui-util.h"
#include "date.h"
#include "gnc-ui.h"
#include "guile-util.h"
#include "messages.h"
#include "query-user.h"
#include "reconcile-list.h"
#include "window-help.h"
#include "window-reconcile.h"
#include "window-register.h"
/** STRUCTS *********************************************************/
struct _RecnWindow
{
Account *account; /* The account that we are reconciling */
double new_ending; /* The new ending balance */
gnc_numeric new_ending; /* The new ending balance */
time_t statement_date; /* The statement date */
gboolean use_shares; /* Use share balances */
@ -109,7 +110,7 @@ struct _RecnWindow
/** PROTOTYPES ******************************************************/
static double recnRecalculateBalance( RecnWindow *recnData );
static gnc_numeric recnRecalculateBalance( RecnWindow *recnData );
static void recnClose(GtkWidget *w, gpointer data);
static void recnFinishCB(GtkWidget *w, gpointer data);
@ -167,16 +168,16 @@ recnRefresh(Account *account)
* Return: the difference between the nominal ending balance *
* and the 'effective' ending balance. *
\********************************************************************/
static double
static gnc_numeric
recnRecalculateBalance(RecnWindow *recnData)
{
const char *amount;
double debit;
double credit;
double starting;
double ending;
double reconciled;
double diff;
gnc_numeric debit;
gnc_numeric credit;
gnc_numeric starting;
gnc_numeric ending;
gnc_numeric reconciled;
gnc_numeric diff;
GNCPrintAmountInfo print_info;
gboolean reverse_balance;
@ -185,33 +186,35 @@ recnRecalculateBalance(RecnWindow *recnData)
/* update the starting balance */
if (recnData->use_shares)
{
starting = DxaccAccountGetShareReconciledBalance(recnData->account);
starting = xaccAccountGetShareReconciledBalance(recnData->account);
print_info = gnc_account_quantity_print_info (recnData->account, TRUE);
}
else
{
starting = DxaccAccountGetReconciledBalance(recnData->account);
starting = xaccAccountGetReconciledBalance(recnData->account);
print_info = gnc_account_value_print_info (recnData->account, TRUE);
}
if (reverse_balance)
starting = -starting;
starting = gnc_numeric_neg (starting);
amount = DxaccPrintAmount(starting, print_info);
gnc_set_label_color(recnData->starting, starting);
amount = xaccPrintAmount(starting, print_info);
gnc_set_label_color(recnData->starting,
gnc_numeric_to_double (starting));
gtk_label_set_text(GTK_LABEL(recnData->starting), amount);
if (reverse_balance)
starting = -starting;
starting = gnc_numeric_neg (starting);
/* update the ending balance */
ending = recnData->new_ending;
if (reverse_balance)
ending = -ending;
amount = DxaccPrintAmount(ending, print_info);
gnc_set_label_color(recnData->ending, ending);
ending = gnc_numeric_neg (ending);
amount = xaccPrintAmount(ending, print_info);
gnc_set_label_color(recnData->ending,
gnc_numeric_to_double (ending));
gtk_label_set_text(GTK_LABEL(recnData->ending), amount);
if (reverse_balance)
ending = -ending;
ending = gnc_numeric_neg (ending);
debit = gnc_reconcile_list_reconciled_balance
(GNC_RECONCILE_LIST(recnData->debit));
@ -220,34 +223,37 @@ recnRecalculateBalance(RecnWindow *recnData)
(GNC_RECONCILE_LIST(recnData->credit));
/* Update the total debit and credit fields */
amount = DxaccPrintAmount(ABS(debit), print_info);
amount = xaccPrintAmount(debit, print_info);
gtk_label_set_text(GTK_LABEL(recnData->total_debit), amount);
amount = DxaccPrintAmount(credit, print_info);
amount = xaccPrintAmount(credit, print_info);
gtk_label_set_text(GTK_LABEL(recnData->total_credit), amount);
/* update the reconciled balance */
reconciled = starting + debit - credit;
reconciled = gnc_numeric_add_fixed (starting,
gnc_numeric_sub_fixed (debit, credit));
if (reverse_balance)
reconciled = -reconciled;
amount = DxaccPrintAmount(reconciled, print_info);
gnc_set_label_color(recnData->reconciled, reconciled);
reconciled = gnc_numeric_neg (reconciled);
amount = xaccPrintAmount(reconciled, print_info);
gnc_set_label_color(recnData->reconciled,
gnc_numeric_to_double (reconciled));
gtk_label_set_text(GTK_LABEL(recnData->reconciled), amount);
if (reverse_balance)
reconciled = -reconciled;
reconciled = gnc_numeric_neg (reconciled);
/* update the difference */
diff = ending - reconciled;
diff = gnc_numeric_sub_fixed (ending, reconciled);
if (reverse_balance)
diff = -diff;
amount = DxaccPrintAmount(diff, print_info);
gnc_set_label_color(recnData->difference, diff);
diff = gnc_numeric_neg (diff);
amount = xaccPrintAmount(diff, print_info);
gnc_set_label_color(recnData->difference,
gnc_numeric_to_double (diff));
gtk_label_set_text(GTK_LABEL(recnData->difference), amount);
if (reverse_balance)
diff = -diff;
diff = gnc_numeric_neg (diff);
gtk_widget_set_sensitive(recnData->finish_button, DEQ(diff, 0.0));
gtk_widget_set_sensitive(recnData->finish_button, gnc_numeric_zero_p (diff));
return diff;
}
@ -256,27 +262,9 @@ static gboolean
gnc_start_recn_update_cb(GtkWidget *widget, GdkEventFocus *event,
gpointer data)
{
GtkEntry *entry = GTK_ENTRY(widget);
GNCPrintAmountInfo print_info;
Account *account = data;
const char * new_string;
const char * string;
double value;
string = gtk_entry_get_text(entry);
value = 0.0;
DxaccParseAmount(string, TRUE, &value, NULL);
/* FIXME */
print_info = gnc_account_value_print_info (account, FALSE);
new_string = DxaccPrintAmount(value, print_info);
GNCAmountEdit *edit = data;
if (safe_strcmp(string, new_string) == 0)
return FALSE;
gtk_entry_set_text(entry, new_string);
gnc_amount_edit_evaluate (edit);
return FALSE;
}
@ -297,13 +285,12 @@ gnc_start_recn_update_cb(GtkWidget *widget, GdkEventFocus *event,
\********************************************************************/
static gboolean
startRecnWindow(GtkWidget *parent, Account *account,
double *new_ending, time_t *statement_date)
gnc_numeric *new_ending, time_t *statement_date)
{
GtkWidget *dialog, *end_value, *date_value;
GNCAccountType account_type;
GNCPrintAmountInfo print_info;
const char *amount;
double dendBalance;
gnc_numeric ending;
char *title;
int result;
@ -312,23 +299,21 @@ startRecnWindow(GtkWidget *parent, Account *account,
if ((account_type == STOCK) || (account_type == MUTUAL) ||
(account_type == CURRENCY))
{
dendBalance = DxaccAccountGetShareReconciledBalance(account);
ending = xaccAccountGetShareReconciledBalance(account);
print_info = gnc_account_quantity_print_info (account, TRUE);
}
else
{
dendBalance = DxaccAccountGetReconciledBalance(account);
ending = xaccAccountGetReconciledBalance(account);
print_info = gnc_account_value_print_info (account, TRUE);
}
if (gnc_reverse_balance(account))
{
dendBalance = -dendBalance;
*new_ending = -(*new_ending);
ending = gnc_numeric_neg (ending);
*new_ending = gnc_numeric_neg (*new_ending);
}
amount = DxaccPrintAmount(dendBalance, print_info);
/* Create the dialog box... */
title = gnc_recn_make_window_name(account);
@ -351,22 +336,33 @@ startRecnWindow(GtkWidget *parent, Account *account,
GtkWidget *date_title = gtk_label_new(_("Statement Date:"));
GtkWidget *start_title = gtk_label_new(_("Starting Balance:"));
GtkWidget *end_title = gtk_label_new(_("Ending Balance:"));
GtkWidget *start_value = gtk_label_new(amount);
GtkWidget *start_value =
gtk_label_new(xaccPrintAmount (ending, print_info));
GtkWidget *vbox = GNOME_DIALOG(dialog)->vbox;
GtkWidget *entry;
date_value = gnc_date_edit_new(*statement_date, FALSE, FALSE);
end_value = gtk_entry_new();
end_value = gnc_amount_edit_new ();
print_info.use_symbol = 0;
amount = DxaccPrintAmount(*new_ending, print_info);
gtk_entry_set_text(GTK_ENTRY(end_value), amount);
gtk_editable_select_region(GTK_EDITABLE(end_value), 0, -1);
gnc_amount_edit_set_print_info (GNC_AMOUNT_EDIT (end_value), print_info);
if ((account_type == STOCK) || (account_type == MUTUAL) ||
(account_type == CURRENCY))
gnc_amount_edit_set_fraction (GNC_AMOUNT_EDIT (end_value),
xaccAccountGetSecuritySCU (account));
else
gnc_amount_edit_set_fraction (GNC_AMOUNT_EDIT (end_value),
xaccAccountGetCurrencySCU (account));
gtk_signal_connect(GTK_OBJECT(end_value), "focus-out-event",
GTK_SIGNAL_FUNC(gnc_start_recn_update_cb), account);
gnc_amount_edit_set_amount (GNC_AMOUNT_EDIT (end_value), *new_ending);
gnome_dialog_editable_enters(GNOME_DIALOG(dialog),
GTK_EDITABLE(end_value));
entry = gnc_amount_edit_gtk_entry (GNC_AMOUNT_EDIT (end_value));
gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1);
gtk_signal_connect(GTK_OBJECT(entry), "focus-out-event",
GTK_SIGNAL_FUNC(gnc_start_recn_update_cb), end_value);
gnome_dialog_editable_enters(GNOME_DIALOG(dialog), GTK_EDITABLE(entry));
gtk_misc_set_alignment(GTK_MISC(date_title), 1.0, 0.5);
gtk_misc_set_alignment(GTK_MISC(start_title), 1.0, 0.5);
@ -401,17 +397,11 @@ startRecnWindow(GtkWidget *parent, Account *account,
if (result == 0) /* ok button */
{
gchar *string;
string = gtk_entry_get_text(GTK_ENTRY(end_value));
*new_ending = 0.0;
DxaccParseAmount(string, TRUE, new_ending, NULL);
*new_ending = gnc_amount_edit_get_amount (GNC_AMOUNT_EDIT (end_value));
*statement_date = gnc_date_edit_get_date(GNC_DATE_EDIT(date_value));
if (gnc_reverse_balance(account))
*new_ending = -(*new_ending);
*new_ending = gnc_numeric_neg (*new_ending);
}
/* cancel or delete */
@ -481,7 +471,7 @@ static void
gnc_reconcile_window_focus_cb(GtkWidget *widget, GdkEventFocus *event,
gpointer data)
{
RecnWindow *recnData = (RecnWindow *) data;
RecnWindow *recnData = data;
GNCReconcileList *this_list, *other_list;
GNCReconcileList *debit, *credit;
@ -643,15 +633,15 @@ static void
gnc_ui_reconcile_window_change_cb(GtkButton *button, gpointer data)
{
RecnWindow *recnData = (RecnWindow *) data;
double new_ending = recnData->new_ending;
gnc_numeric new_ending = recnData->new_ending;
time_t statement_date = recnData->statement_date;
if (startRecnWindow(recnData->window, recnData->account,
&new_ending, &statement_date))
{
recnData->new_ending = new_ending;
recnData->statement_date = statement_date;
recnRecalculateBalance(recnData);
recnRecalculateBalance (recnData);
}
}
@ -1267,13 +1257,14 @@ gnc_recn_create_tool_bar(RecnWindow *recnData)
RecnWindow *
recnWindow(GtkWidget *parent, Account *account)
{
static time_t last_statement_date = 0;
RecnWindow *recnData;
GtkWidget *statusbar;
GtkWidget *vbox;
GtkWidget *dock;
double new_ending;
gnc_numeric new_ending;
time_t statement_date;
static time_t last_statement_date = 0;
GNCAccountType type;
if (account == NULL)
@ -1286,9 +1277,9 @@ recnWindow(GtkWidget *parent, Account *account)
(type == CURRENCY));
if (recnData->use_shares)
new_ending = DxaccAccountGetShareBalance(account);
new_ending = xaccAccountGetShareBalance(account);
else
new_ending = DxaccAccountGetBalance(account);
new_ending = xaccAccountGetBalance(account);
/* The last time reconciliation was attempted during the current
* execution of gnucash, the date was stored. Use that date if
@ -1296,21 +1287,17 @@ recnWindow(GtkWidget *parent, Account *account)
* which statements are issued at the same time, like multiple
* bank accounts on a single statement.
*/
if( !last_statement_date )
{
if (!last_statement_date)
statement_date = time(NULL);
}
else
{
statement_date = last_statement_date;
}
/* Popup a little window to prompt the user to enter the
* ending balance for his/her bank statement */
if (!startRecnWindow(parent, account, &new_ending, &statement_date))
{
REMOVE_FROM_LIST(RecnWindow, recnList, account, account);
free(recnData);
free (recnData);
return NULL;
}
@ -1620,7 +1607,7 @@ find_payment_account(Account *account)
continue;
/* ignore 'purchases' */
if (DxaccSplitGetShareAmount(split) <= 0.0)
if (!gnc_numeric_positive_p (xaccSplitGetShareAmount(split)))
continue;
trans = xaccSplitGetParent(split);
@ -1667,7 +1654,7 @@ recnFinishCB(GtkWidget *w, gpointer data)
gboolean auto_payment;
time_t date;
if (!DEQ(recnRecalculateBalance(recnData), 0.0))
if (!gnc_numeric_zero_p (recnRecalculateBalance(recnData)))
{
const char *message = _("The account is not balanced.\n"
"Are you sure you want to finish?");
@ -1688,15 +1675,15 @@ recnFinishCB(GtkWidget *w, gpointer data)
if (auto_payment &&
(xaccAccountGetType(recnData->account) == CREDIT) &&
(recnData->new_ending < 0.0) &&
!DEQ(recnData->new_ending, 0.0))
(gnc_numeric_negative_p (recnData->new_ending)))
{
XferDialog *xfer;
Account *account;
xfer = gnc_xfer_dialog(NULL, recnData->account);
gnc_xfer_dialog_set_amount(xfer, -recnData->new_ending);
gnc_xfer_dialog_set_amount(xfer,
gnc_numeric_to_double (gnc_numeric_neg (recnData->new_ending)));
account = find_payment_account(recnData->account);
if (account != NULL)

Write Preview
Loading…
Cancel
Save