[grisbi-cvs] grisbi/src affichage.c, 1.173, 1.174 affichage_liste.c, 1.122, 1.123 balance_estimate_config.c, 1.15, 1.16 balance_estimate_data.c, 1.22, 1.23 balance_estimate_data.h, 1.15, 1.16 balance_estimate_future.c, 1.9, 1.10 balance_estimate_future.h, 1.5, 1.6 balance_estimate_tab.c, 1.66, 1.67 balance_estimate_tab.h, 1.15, 1.16 barre_outils.c, 1.133, 1.134 custom_list.c, 1.7, 1.8 erreur.c, 1.100, 1.101 etats_config.c, 1.177, 1.178 export_csv.c, 1.28, 1.29 fenetre_principale.c, 1.135, 1.136 file_obfuscate_qif.c, 1.5, 1.6 go-charmap-sel.c, 1.12, 1.13 go-optionmenu.c, 1.11, 1.12 gsb_account.c, 1.49, 1.50 gsb_account_property.c, 1.53, 1.54 gsb_archive_config.c, 1.29, 1.30 gsb_assistant_account.c, 1.27, 1.28 gsb_assistant_archive.c, 1.44, 1.45 gsb_assistant_archive_export.c, 1.20, 1.21 gsb_assistant_file.c, 1.19, 1.20 gsb_assistant_first.c, 1.29, 1.30 gsb_assistant_reconcile_config.c, 1.29, 1.30 gsb_autofunc.c, 1.27, 1.28 gsb_automem.c, 1.28, 1.29 gsb_bank.c, 1.26, 1.27 gsb_data_account.c, 1.103, 1.104 gsb_data_archive.c, 1.16, 1.17 gsb_data_ archive_store.c, 1.18, 1.19 gsb_data_bank.c, 1.14, 1.15 gsb_data_budget.c, 1.56, 1.57 gsb_data_currency.c, 1.19, 1.20 gsb_data_currency_link.c, 1.17, 1.18 gsb_data_fyear.c, 1.22, 1.23 gsb_data_import_rule.c, 1.5, 1.6 gsb_data_partial_balance.c, 1.12, 1.13 gsb_data_partial_balance.h, 1.3, 1.4 gsb_data_payee.c, 1.53, 1.54 gsb_data_payment.c, 1.21, 1.22 gsb_data_reconcile.c, 1.22, 1.23 gsb_data_report.c, 1.34, 1.35 gsb_data_report_amout_comparison.c, 1.14, 1.15 gsb_data_report_text_comparison.c, 1.17, 1.18 gsb_data_scheduled.c, 1.34, 1.35 gsb_data_transaction.c, 1.88, 1.89 gsb_file.c, 1.64, 1.65 gsb_file_config.c, 1.96, 1.97 gsb_file_load.c, 1.221, 1.222 gsb_file_save.c, 1.165, 1.166 gsb_reconcile.h, 1.2, 1.3 gsb_transactions_list.c, 1.210, 1.211 gsb_transactions_list_sort.c, 1.23, 1.24 gtk_combofix.c, 1.75, 1.76 import.c, 1.332, 1.333 main.c, 1.175, 1.176 menu.c, 1.151, 1.152 navigation.c, 1.143, 1.144 parametres.c, 1.214, 1.215 parse_cmdline.c, 1.18, 1.19 print_report.c, 1.11, 1.12 print_transactions_list.c, 1.14, 1.15 qif.c, 1.145, 1.146 str uctures.h, 1.246, 1.247 tiers_onglet.c, 1.172, 1.173 traitement_variables.c, 1.193, 1.194 transaction_list.c, 1.61, 1.62 transaction_list_select.c, 1.10, 1.11 transaction_list_sort.h, 1.1, 1.2 transaction_model.c, 1.7, 1.8 transaction_model.h, 1.2, 1.3 utils.c, 1.64, 1.65 utils.h, 1.29, 1.30 utils_font.c, 1.4, 1.5
Pierre Biava
pbiava at users.sourceforge.net
Tue May 4 14:27:55 CEST 2010
- Previous message: [grisbi-cvs] grisbi/po cs.po, 1.112, 1.113 da.po, 1.116, 1.117 de.po, 1.191, 1.192 el.po, 1.80, 1.81 eo.po, 1.73, 1.74 es.po, 1.192, 1.193 fa.po, 1.103, 1.104 fr.po, 1.249, 1.250 grisbi.pot, 1.151, 1.152 he.po, 1.109, 1.110 it.po, 1.109, 1.110 nl.po, 1.108, 1.109 pl.po, 1.114, 1.115 pt_BR.po, 1.111, 1.112 ro.po, 1.110, 1.111 ru.po, 1.108, 1.109 zh_CN.po, 1.104, 1.105
- Next message: [grisbi-cvs] grisbi/src balance_estimate_data.c,1.23,1.24
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/grisbi/grisbi/src
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4080/src
Modified Files:
affichage.c affichage_liste.c balance_estimate_config.c
balance_estimate_data.c balance_estimate_data.h
balance_estimate_future.c balance_estimate_future.h
balance_estimate_tab.c balance_estimate_tab.h barre_outils.c
custom_list.c erreur.c etats_config.c export_csv.c
fenetre_principale.c file_obfuscate_qif.c go-charmap-sel.c
go-optionmenu.c gsb_account.c gsb_account_property.c
gsb_archive_config.c gsb_assistant_account.c
gsb_assistant_archive.c gsb_assistant_archive_export.c
gsb_assistant_file.c gsb_assistant_first.c
gsb_assistant_reconcile_config.c gsb_autofunc.c gsb_automem.c
gsb_bank.c gsb_data_account.c gsb_data_archive.c
gsb_data_archive_store.c gsb_data_bank.c gsb_data_budget.c
gsb_data_currency.c gsb_data_currency_link.c gsb_data_fyear.c
gsb_data_import_rule.c gsb_data_partial_balance.c
gsb_data_partial_balance.h gsb_data_payee.c gsb_data_payment.c
gsb_data_reconcile.c gsb_data_report.c
gsb_data_report_amout_comparison.c
gsb_data_report_text_comparison.c gsb_data_scheduled.c
gsb_data_transaction.c gsb_file.c gsb_file_config.c
gsb_file_load.c gsb_file_save.c gsb_reconcile.h
gsb_transactions_list.c gsb_transactions_list_sort.c
gtk_combofix.c import.c main.c menu.c navigation.c
parametres.c parse_cmdline.c print_report.c
print_transactions_list.c qif.c structures.h tiers_onglet.c
traitement_variables.c transaction_list.c
transaction_list_select.c transaction_list_sort.h
transaction_model.c transaction_model.h utils.c utils.h
utils_font.c
Log Message:
Execution of mk_include. Adding transfers in the budget estimation module
Index: gsb_data_import_rule.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_import_rule.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gsb_data_import_rule.c 5 Apr 2010 21:24:53 -0000 1.5
+++ gsb_data_import_rule.c 4 May 2010 12:27:53 -0000 1.6
@@ -62,7 +62,7 @@
/*START_STATIC*/
-static void _gsb_data_import_rule_free ( struct_import_rule* import_rule);
+static void _gsb_data_import_rule_free ( struct_import_rule* import_rule);
static gpointer gsb_data_import_rule_get_structure ( gint import_rule_number );
static gint gsb_data_import_rule_max_number ( void );
/*END_STATIC*/
Index: gsb_data_report_amout_comparison.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_report_amout_comparison.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gsb_data_report_amout_comparison.c 27 Apr 2009 19:41:03 -0000 1.14
+++ gsb_data_report_amout_comparison.c 4 May 2010 12:27:53 -0000 1.15
@@ -67,8 +67,8 @@
/*START_STATIC*/
-static void _gsb_data_report_amount_comparison_free ( struct_amount_comparison *amount_comparison );
-static struct_amount_comparison *gsb_data_report_amount_comparison_get_struct_by_no ( gint amount_comparison_number );
+static void _gsb_data_report_amount_comparison_free ( struct_amount_comparison *amount_comparison );
+static struct_amount_comparison *gsb_data_report_amount_comparison_get_struct_by_no ( gint amount_comparison_number );
static gint gsb_data_report_amount_comparison_max_number ( void );
/*END_STATIC*/
Index: etats_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/etats_config.c,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- etats_config.c 5 Apr 2010 21:24:53 -0000 1.177
+++ etats_config.c 4 May 2010 12:27:52 -0000 1.178
@@ -100,31 +100,31 @@
static void remplissage_liste_tiers_etats ( void );
static void remplit_liste_comparaisons_montants_etat ( void );
static void remplit_liste_comparaisons_textes_etat ( void );
-static gboolean report_config_budget_select_all ( GtkWidget *button,
+static gboolean report_config_budget_select_all ( GtkWidget *button,
gboolean *select_ptr );
-static gboolean report_config_budget_select_type ( GtkWidget *button,
+static gboolean report_config_budget_select_type ( GtkWidget *button,
gboolean *type_ptr );
-static GSList *report_config_categ_budget_get_selected ( gboolean is_categ );
-static gboolean report_config_categ_budget_toggled ( GtkCellRendererToggle *radio_renderer,
+static GSList *report_config_categ_budget_get_selected ( gboolean is_categ );
+static gboolean report_config_categ_budget_toggled ( GtkCellRendererToggle *radio_renderer,
gchar *path_str,
GtkTreeStore *store );
-static gboolean report_config_category_select_all ( GtkWidget *button,
+static gboolean report_config_category_select_all ( GtkWidget *button,
gboolean *select_ptr );
-static gboolean report_config_category_select_type ( GtkWidget *button,
+static gboolean report_config_category_select_type ( GtkWidget *button,
gboolean *type_ptr );
-static void report_config_category_toggle_categ ( struct_categ_budget_sel *categ_budget_struct,
+static void report_config_category_toggle_categ ( struct_categ_budget_sel *categ_budget_struct,
gboolean is_categ );
-static void report_config_category_update_treeview ( gboolean is_categ );
-static GtkWidget *report_config_create_categ_budget_list ( void );
-static gboolean report_config_fill_categ_budget_list ( gboolean is_categ );
-static gboolean report_config_mix_select_all ( GtkTreeModel *model,
+static void report_config_category_update_treeview ( gboolean is_categ );
+static GtkWidget *report_config_create_categ_budget_list ( void );
+static gboolean report_config_fill_categ_budget_list ( gboolean is_categ );
+static gboolean report_config_mix_select_all ( GtkTreeModel *model,
gboolean toggle_value );
-static gboolean report_config_mix_select_type ( gboolean is_categ,
+static gboolean report_config_mix_select_type ( gboolean is_categ,
gboolean type );
-static void report_config_mixed_list_add_div ( gboolean is_categ,
+static void report_config_mixed_list_add_div ( gboolean is_categ,
const gchar *name,
gint number );
-static void report_config_mixed_list_add_sub_div ( gboolean is_categ,
+static void report_config_mixed_list_add_sub_div ( gboolean is_categ,
const gchar *name,
gint number );
static gboolean report_tree_selectable_func (GtkTreeSelection *selection,
Index: gsb_assistant_archive_export.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_assistant_archive_export.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- gsb_assistant_archive_export.c 8 Mar 2010 21:30:00 -0000 1.20
+++ gsb_assistant_archive_export.c 4 May 2010 12:27:52 -0000 1.21
@@ -74,14 +74,14 @@
static GtkWidget *archive_export_label_success = NULL;
/*START_STATIC*/
-static gint gsb_assistant_archive_export_get_selected_archive ( GtkTreeModel *model );
-static GtkWidget *gsb_assistant_archive_export_page_choose ( GtkWidget *assistant );
-static GtkWidget *gsb_assistant_archive_export_page_name ( GtkWidget *assistant );
-static GtkWidget *gsb_assistant_archive_export_page_succes ( GtkWidget *assistant );
-static gboolean gsb_assistant_archive_export_toggled ( GtkCellRendererToggle *renderer,
+static gint gsb_assistant_archive_export_get_selected_archive ( GtkTreeModel *model );
+static GtkWidget *gsb_assistant_archive_export_page_choose ( GtkWidget *assistant );
+static GtkWidget *gsb_assistant_archive_export_page_name ( GtkWidget *assistant );
+static GtkWidget *gsb_assistant_archive_export_page_succes ( GtkWidget *assistant );
+static gboolean gsb_assistant_archive_export_toggled ( GtkCellRendererToggle *renderer,
gchar *path_string,
GtkWidget *assistant );
-static gboolean gsb_assistant_archive_switch ( GtkWidget *assistant,
+static gboolean gsb_assistant_archive_switch ( GtkWidget *assistant,
gint new_page );
/*END_STATIC*/
Index: gsb_file_save.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_save.c,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- gsb_file_save.c 20 Apr 2010 21:34:33 -0000 1.165
+++ gsb_file_save.c 4 May 2010 12:27:53 -0000 1.166
@@ -65,6 +65,7 @@
#include "./structures.h"
#include "./custom_list.h"
#include "./gsb_data_form.h"
+#include "./utils_str.h"
#include "./gsb_scheduler_list.h"
#include "./include.h"
#include "./gsb_calendar.h"
@@ -144,6 +145,7 @@
extern GdkColor calendar_entry_color;
extern GdkColor couleur_bet_division;
extern GdkColor couleur_bet_future;
+extern GdkColor couleur_bet_transfert;
extern GdkColor couleur_fond[2];
extern GdkColor couleur_grise;
extern GdkColor couleur_jour;
@@ -801,7 +803,10 @@
"\t\tCouleur_bet_division_blue=\"%d\"\n"
"\t\tCouleur_bet_future_red=\"%d\"\n"
"\t\tCouleur_bet_future_green=\"%d\"\n"
- "\t\tCouleur_bet_future_blue=\"%d\" />\n",
+ "\t\tCouleur_bet_future_blue=\"%d\"\n"
+ "\t\tCouleur_bet_transfert_red=\"%d\"\n"
+ "\t\tCouleur_bet_transfert_green=\"%d\"\n"
+ "\t\tCouleur_bet_transfert_blue=\"%d\" />\n",
couleur_fond[0].red,
couleur_fond[0].green,
@@ -838,7 +843,10 @@
couleur_bet_division.blue,
couleur_bet_future.red,
couleur_bet_future.green,
- couleur_bet_future.blue );
+ couleur_bet_future.blue,
+ couleur_bet_transfert.red,
+ couleur_bet_transfert.green,
+ couleur_bet_transfert.blue );
/* append the new string to the file content
* and return the new iterator */
Index: print_transactions_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/print_transactions_list.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- print_transactions_list.c 14 Feb 2010 17:48:50 -0000 1.14
+++ print_transactions_list.c 4 May 2010 12:27:53 -0000 1.15
@@ -51,23 +51,23 @@
static gboolean print_transactions_list_begin ( GtkPrintOperation *operation,
GtkPrintContext *context,
gpointer null );
-static void print_transactions_list_calculate_columns ( gdouble page_width );
-static void print_transactions_list_draw_background ( CustomRecord *record,
+static void print_transactions_list_calculate_columns ( gdouble page_width );
+static void print_transactions_list_draw_background ( CustomRecord *record,
gboolean color_bg,
gint line_position );
-static gint print_transactions_list_draw_column ( gint column_position,
+static gint print_transactions_list_draw_column ( gint column_position,
gint line_position );
-static gint print_transactions_list_draw_columns_title ( GtkPrintContext *context,
+static gint print_transactions_list_draw_columns_title ( GtkPrintContext *context,
gint line_position);
-static gint print_transactions_list_draw_line ( gint line_position );
+static gint print_transactions_list_draw_line ( gint line_position );
static gboolean print_transactions_list_draw_page ( GtkPrintOperation *operation,
GtkPrintContext *context,
gint page,
gpointer null );
-static gint print_transactions_list_draw_row ( GtkPrintContext *context,
+static gint print_transactions_list_draw_row ( GtkPrintContext *context,
CustomRecord *record,
gint line_position );
-static gint print_transactions_list_draw_title ( GtkPrintContext *context,
+static gint print_transactions_list_draw_title ( GtkPrintContext *context,
gint line_position );
static gboolean print_transactions_list_get_visibles_lines ( gint *number_of_archives,
gint *number_of_transactions );
Index: navigation.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/navigation.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- navigation.c 5 Apr 2010 21:24:53 -0000 1.143
+++ navigation.c 4 May 2010 12:27:53 -0000 1.144
@@ -64,11 +64,11 @@
static gboolean gsb_gui_navigation_check_key_press ( GtkWidget *tree_view,
GdkEventKey *ev,
GtkTreeModel *model );
-static gboolean gsb_gui_navigation_remove_account_iterator ( GtkTreeModel * tree_model,
+static gboolean gsb_gui_navigation_remove_account_iterator ( GtkTreeModel * tree_model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer data );
-static gboolean gsb_gui_navigation_remove_report_iterator ( GtkTreeModel * tree_model,
+static gboolean gsb_gui_navigation_remove_report_iterator ( GtkTreeModel * tree_model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer data );
@@ -80,14 +80,14 @@
static void gsb_gui_navigation_update_account_iter ( GtkTreeModel * model,
GtkTreeIter * account_iter,
gint account_number );
-static gboolean gsb_gui_navigation_update_account_iterator ( GtkTreeModel * tree_model,
+static gboolean gsb_gui_navigation_update_account_iterator ( GtkTreeModel * tree_model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer data );
static void gsb_gui_navigation_update_report_iter ( GtkTreeModel * model,
GtkTreeIter * report_iter,
gint report_number );
-static gboolean gsb_gui_navigation_update_report_iterator ( GtkTreeModel * tree_model,
+static gboolean gsb_gui_navigation_update_report_iterator ( GtkTreeModel * tree_model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer data );
Index: erreur.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/erreur.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- erreur.c 23 Mar 2010 22:15:21 -0000 1.100
+++ erreur.c 4 May 2010 12:27:52 -0000 1.101
@@ -38,6 +38,7 @@
#include "./utils_str.h"
#include "./include.h"
#include "./structures.h"
+#include "./gsb_real.h"
/*END_INCLUDE*/
#ifdef HAVE_BACKTRACE
Index: gsb_assistant_file.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_assistant_file.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- gsb_assistant_file.c 9 Jan 2010 20:57:38 -0000 1.19
+++ gsb_assistant_file.c 4 May 2010 12:27:52 -0000 1.20
@@ -51,15 +51,15 @@
/*END_INCLUDE*/
/*START_STATIC*/
-static gboolean gsb_assistant_file_change_title ( GtkWidget *title_entry,
+static gboolean gsb_assistant_file_change_title ( GtkWidget *title_entry,
GtkWidget *filename_entry );
-static gboolean gsb_assistant_file_choose_filename ( GtkWidget *button,
+static gboolean gsb_assistant_file_choose_filename ( GtkWidget *button,
GtkWidget *entry );
-static GtkWidget *gsb_assistant_file_page_2 ( GtkWidget *assistant );
-static GtkWidget *gsb_assistant_file_page_3 ( GtkWidget *assistant );
-static GtkWidget *gsb_assistant_file_page_4 ( GtkWidget *assistant );
-static GtkWidget *gsb_assistant_file_page_5 ( GtkWidget *assistant );
-static GtkWidget *gsb_assistant_file_page_finish ( GtkWidget *assistant,
+static GtkWidget *gsb_assistant_file_page_2 ( GtkWidget *assistant );
+static GtkWidget *gsb_assistant_file_page_3 ( GtkWidget *assistant );
+static GtkWidget *gsb_assistant_file_page_4 ( GtkWidget *assistant );
+static GtkWidget *gsb_assistant_file_page_5 ( GtkWidget *assistant );
+static GtkWidget *gsb_assistant_file_page_finish ( GtkWidget *assistant,
gboolean import );
/*END_STATIC*/
Index: go-charmap-sel.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/go-charmap-sel.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- go-charmap-sel.c 9 Jan 2009 14:49:00 -0000 1.12
+++ go-charmap-sel.c 4 May 2010 12:27:52 -0000 1.13
@@ -41,28 +41,28 @@
};
/*START_STATIC*/
-static void cb_find_entry (GtkMenuItem *w, struct cb_find_entry *cl);
-static int charset_order (const void *_a, const void *_b);
-static void cs_build_menu (GOCharmapSel *cs);
-static void cs_class_init (GtkWidgetClass *widget_klass);
-static void cs_emphasize_label (GtkLabel *label);
-static void cs_get_property (GObject *object,
+static void cb_find_entry (GtkMenuItem *w, struct cb_find_entry *cl);
+static int charset_order (const void *_a, const void *_b);
+static void cs_build_menu (GOCharmapSel *cs);
+static void cs_class_init (GtkWidgetClass *widget_klass);
+static void cs_emphasize_label (GtkLabel *label);
+static void cs_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec);
-static void cs_init (GOCharmapSel *cs);
-static gboolean cs_mnemonic_activate (GtkWidget *w, gboolean group_cycling);
-static void cs_set_property (GObject *object,
+static void cs_init (GOCharmapSel *cs);
+static gboolean cs_mnemonic_activate (GtkWidget *w, gboolean group_cycling);
+static void cs_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec);
-static void encodings_changed_cb (GOOptionMenu *optionmenu, GOCharmapSel *cs);
-static char const * get_locale_encoding_name (GOCharmapSel *cs);
+static void encodings_changed_cb (GOOptionMenu *optionmenu, GOCharmapSel *cs);
+static char const * get_locale_encoding_name (GOCharmapSel *cs);
static const char * go_charmap_sel_get_encoding_name (G_GNUC_UNUSED GOCharmapSel *cs,
const char *encoding);
-static gboolean iconv_supported (const char *to, const char *from);
-static int lgroups_order (const void *_a, const void *_b);
-static void set_menu_to_default (GOCharmapSel *cs, gint item);
+static gboolean iconv_supported (const char *to, const char *from);
+static int lgroups_order (const void *_a, const void *_b);
+static void set_menu_to_default (GOCharmapSel *cs, gint item);
/*END_STATIC*/
/*START_EXTERN*/
Index: gsb_data_payee.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_payee.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- gsb_data_payee.c 24 Apr 2010 18:23:30 -0000 1.53
+++ gsb_data_payee.c 4 May 2010 12:27:53 -0000 1.54
@@ -62,7 +62,7 @@
/*START_STATIC*/
-static void _gsb_data_payee_free ( struct_payee* payee);
+static void _gsb_data_payee_free ( struct_payee* payee);
static GSList *gsb_data_payee_get_name_list ( void );
static gint gsb_data_payee_get_pointer_from_name_in_glist ( struct_payee *payee,
const gchar *name );
Index: export_csv.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/export_csv.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- export_csv.c 5 Apr 2010 21:24:53 -0000 1.28
+++ export_csv.c 4 May 2010 12:27:52 -0000 1.29
@@ -49,18 +49,17 @@
#include "./utils_files.h"
#include "./gsb_data_transaction.h"
#include "./include.h"
-#include "./gsb_real.h"
/*END_INCLUDE*/
/*START_STATIC*/
-static void csv_add_record(FILE* file,
+static void csv_add_record(FILE* file,
gboolean clear_all,
gboolean print_balance );
-static void csv_clear_fields(gboolean clear_all);
-static FILE *gsb_csv_export_open_file ( const gchar *filename );
-static gboolean gsb_csv_export_title_line ( FILE *csv_file,
+static void csv_clear_fields(gboolean clear_all);
+static FILE *gsb_csv_export_open_file ( const gchar *filename );
+static gboolean gsb_csv_export_title_line ( FILE *csv_file,
gboolean print_balance );
-static gboolean gsb_csv_export_transaction ( gint transaction_number,
+static gboolean gsb_csv_export_transaction ( gint transaction_number,
FILE *csv_file,
gboolean print_balance );
/*END_STATIC*/
Index: balance_estimate_future.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/balance_estimate_future.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- balance_estimate_future.h 3 Apr 2010 19:57:41 -0000 1.5
+++ balance_estimate_future.h 4 May 2010 12:27:52 -0000 1.6
@@ -4,6 +4,8 @@
#include <gtk/gtk.h>
/* START_INCLUDE_H */
+#include "././gsb_real.h"
+#include "././balance_estimate_data.h"
/* END_INCLUDE_H */
@@ -13,6 +15,10 @@
gint mother_row );
gboolean bet_future_new_line_dialog ( GtkTreeModel *tab_model,
gchar *str_date );
+gboolean bet_transfert_modify_line ( gint account_number, gint number );
+gboolean bet_transfert_new_line_dialog ( GtkTreeModel *tab_model,
+ gchar *str_date );
+gchar *gsb_transfert_get_str_amount ( struct_transfert_data *transfert, gsb_real amount );
/* END_DECLARATION */
#endif /*_BALANCE_ESTIMATE_FUTURE_H*/
Index: gsb_data_archive_store.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_archive_store.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- gsb_data_archive_store.c 7 Mar 2010 15:56:04 -0000 1.18
+++ gsb_data_archive_store.c 4 May 2010 12:27:53 -0000 1.19
@@ -69,11 +69,11 @@
/*START_STATIC*/
-static void _gsb_data_archive_store_free ( struct_store_archive *archive );
-static struct_store_archive *gsb_data_archive_store_find_struct ( gint archive_number,
+static void _gsb_data_archive_store_free ( struct_store_archive *archive );
+static struct_store_archive *gsb_data_archive_store_find_struct ( gint archive_number,
gint account_number );
-static gint gsb_data_archive_store_max_number ( void );
-static gint gsb_data_archive_store_new ( void );
+static gint gsb_data_archive_store_max_number ( void );
+static gint gsb_data_archive_store_new ( void );
/*END_STATIC*/
/*START_EXTERN*/
Index: gsb_assistant_archive.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_assistant_archive.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- gsb_assistant_archive.c 3 Apr 2010 19:57:41 -0000 1.44
+++ gsb_assistant_archive.c 4 May 2010 12:27:52 -0000 1.45
@@ -54,21 +54,21 @@
/*END_INCLUDE*/
/*START_STATIC*/
-static void gsb_assistant_archive_add_children_to_list ( gint transaction_number );
-static void gsb_assistant_archive_add_contra_transaction_to_list ( gint transaction_number );
-static void gsb_assistant_archive_add_transaction_to_list ( gpointer transaction_pointer );
-static GtkWidget *gsb_assistant_archive_page_archive_name ( GtkWidget *assistant );
-static GtkWidget *gsb_assistant_archive_page_menu ( GtkWidget *assistant );
-static GtkWidget *gsb_assistant_archive_page_success ( void );
-static gboolean gsb_assistant_archive_switch_to_archive_name ( GtkWidget *assistant,
+static void gsb_assistant_archive_add_children_to_list ( gint transaction_number );
+static void gsb_assistant_archive_add_contra_transaction_to_list ( gint transaction_number );
+static void gsb_assistant_archive_add_transaction_to_list ( gpointer transaction_pointer );
+static GtkWidget *gsb_assistant_archive_page_archive_name ( GtkWidget *assistant );
+static GtkWidget *gsb_assistant_archive_page_menu ( GtkWidget *assistant );
+static GtkWidget *gsb_assistant_archive_page_success ( void );
+static gboolean gsb_assistant_archive_switch_to_archive_name ( GtkWidget *assistant,
gint new_page );
-static gboolean gsb_assistant_archive_switch_to_intro ( GtkWidget *assistant,
+static gboolean gsb_assistant_archive_switch_to_intro ( GtkWidget *assistant,
gint new_page );
-static gboolean gsb_assistant_archive_switch_to_menu ( GtkWidget *assistant,
+static gboolean gsb_assistant_archive_switch_to_menu ( GtkWidget *assistant,
gint new_page );
-static gboolean gsb_assistant_archive_switch_to_succes ( GtkWidget *assistant,
+static gboolean gsb_assistant_archive_switch_to_succes ( GtkWidget *assistant,
gint new_page );
-static gboolean gsb_assistant_archive_update_labels ( GtkWidget *assistant );
+static gboolean gsb_assistant_archive_update_labels ( GtkWidget *assistant );
/*END_STATIC*/
/*START_EXTERN*/
Index: gsb_data_archive.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_archive.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- gsb_data_archive.c 14 Feb 2010 17:48:50 -0000 1.16
+++ gsb_data_archive.c 4 May 2010 12:27:53 -0000 1.17
@@ -62,7 +62,7 @@
} struct_archive;
/*START_STATIC*/
-static void _gsb_data_archive_free ( struct_archive* archive);
+static void _gsb_data_archive_free ( struct_archive* archive);
static gpointer gsb_data_archive_get_structure ( gint archive_number );
static gint gsb_data_archive_max_number ( void );
/*END_STATIC*/
Index: transaction_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/transaction_list.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- transaction_list.c 10 Apr 2010 21:03:15 -0000 1.61
+++ transaction_list.c 4 May 2010 12:27:53 -0000 1.62
@@ -59,10 +59,10 @@
/*END_INCLUDE*/
/*START_STATIC*/
-static void transaction_list_append_child ( gint transaction_number );
-static CustomRecord *transaction_list_create_record ( gint transaction_number,
+static void transaction_list_append_child ( gint transaction_number );
+static CustomRecord *transaction_list_create_record ( gint transaction_number,
gint line_in_transaction );
-static gboolean transaction_list_update_white_child ( CustomRecord *white_record );
+static gboolean transaction_list_update_white_child ( CustomRecord *white_record );
/*END_STATIC*/
/*START_EXTERN*/
Index: balance_estimate_future.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/balance_estimate_future.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- balance_estimate_future.c 18 Apr 2010 07:53:06 -0000 1.9
+++ balance_estimate_future.c 4 May 2010 12:27:52 -0000 1.10
@@ -30,7 +30,6 @@
/*START_INCLUDE*/
#include "balance_estimate_future.h"
-#include "./balance_estimate_tab.h"
#include "./balance_estimate_data.h"
#include "./dialog.h"
#include "./utils_dates.h"
@@ -39,6 +38,8 @@
#include "./gsb_data_account.h"
#include "./gsb_data_budget.h"
#include "./gsb_data_category.h"
[...1308 lines suppressed...]
+ "bet_transfert_category_combo" );
+ gtk_widget_set_sensitive ( widget, FALSE );
+ widget = g_object_get_data ( G_OBJECT ( bet_transfert_dialog ),
+ "bet_transfert_budget_combo" );
+ gtk_widget_set_sensitive ( widget, FALSE );
+ }
+
+}
+
+
+/**
+ *
+ *
+ *
+ *
+ * */
+
/* Local Variables: */
/* c-basic-offset: 4 */
/* End: */
Index: menu.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/menu.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- menu.c 28 Mar 2010 14:40:29 -0000 1.151
+++ menu.c 4 May 2010 12:27:53 -0000 1.152
@@ -65,7 +65,7 @@
static gboolean help_quick_start ( void );
static gboolean help_translation ( void );
static gboolean help_website ( void );
-static void menu_add_widget (GtkUIManager * p_uiManager, GtkWidget * p_widget,
+static void menu_add_widget (GtkUIManager * p_uiManager, GtkWidget * p_widget,
GtkContainer * p_box) ;
/*END_STATIC*/
Index: gsb_assistant_account.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_assistant_account.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- gsb_assistant_account.c 29 Aug 2009 08:36:41 -0000 1.27
+++ gsb_assistant_account.c 4 May 2010 12:27:52 -0000 1.28
@@ -50,10 +50,10 @@
/*START_STATIC*/
static void gsb_assistant_account_change_account_icon ( GtkWidget *button, gpointer data );
-static gboolean gsb_assistant_account_enter_page_finish ( GtkWidget * assistant, gint new_page );
-static GtkWidget *gsb_assistant_account_page_2 ( GtkWidget *assistant );
-static GtkWidget *gsb_assistant_account_page_3 ( GtkWidget *assistant );
-static GtkWidget *gsb_assistant_account_page_finish ( GtkWidget *assistant );
+static gboolean gsb_assistant_account_enter_page_finish ( GtkWidget * assistant, gint new_page );
+static GtkWidget *gsb_assistant_account_page_2 ( GtkWidget *assistant );
+static GtkWidget *gsb_assistant_account_page_3 ( GtkWidget *assistant );
+static GtkWidget *gsb_assistant_account_page_finish ( GtkWidget *assistant );
static gboolean gsb_assistant_account_toggled_kind_account ( GtkWidget *button,
GtkWidget *assistant );
/*END_STATIC*/
Index: gsb_data_transaction.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_transaction.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- gsb_data_transaction.c 24 Apr 2010 05:39:25 -0000 1.88
+++ gsb_data_transaction.c 4 May 2010 12:27:53 -0000 1.89
@@ -45,8 +45,10 @@
#include "./utils_dates.h"
#include "./gsb_real.h"
#include "./utils_str.h"
+#include "./balance_estimate_data.h"
#include "./include.h"
#include "./structures.h"
+#include "./gsb_real.h"
/*END_INCLUDE*/
@@ -101,7 +103,7 @@
/*START_STATIC*/
static void gsb_data_transaction_delete_all_transactions ( void );
-static void gsb_data_transaction_free ( struct_transaction *transaction);
+static void gsb_data_transaction_free ( struct_transaction *transaction);
static gint gsb_data_transaction_get_last_white_number (void);
static struct_transaction *gsb_data_transaction_get_transaction_by_no ( gint transaction_number );
static gboolean gsb_data_transaction_save_transaction_pointer ( gpointer transaction );
Index: gsb_data_currency.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_currency.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- gsb_data_currency.c 13 May 2009 20:15:55 -0000 1.19
+++ gsb_data_currency.c 4 May 2010 12:27:53 -0000 1.20
@@ -48,7 +48,7 @@
} struct_currency;
/*START_STATIC*/
-static void _gsb_data_currency_free ( struct_currency *currency );
+static void _gsb_data_currency_free ( struct_currency *currency );
static gpointer gsb_data_currency_get_structure ( gint currency_number );
static gboolean gsb_data_currency_set_default_currency ( gint currency_number );
/*END_STATIC*/
Index: gsb_data_bank.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_bank.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gsb_data_bank.c 12 Jun 2009 19:06:56 -0000 1.14
+++ gsb_data_bank.c 4 May 2010 12:27:53 -0000 1.15
@@ -61,7 +61,7 @@
} struct_bank;
/*START_STATIC*/
-static void _gsb_data_bank_free ( struct_bank* bank);
+static void _gsb_data_bank_free ( struct_bank* bank);
static gpointer gsb_data_bank_get_structure ( gint bank_number );
/*END_STATIC*/
Index: balance_estimate_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/balance_estimate_config.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- balance_estimate_config.c 18 Apr 2010 14:38:28 -0000 1.15
+++ balance_estimate_config.c 4 May 2010 12:27:52 -0000 1.16
@@ -30,7 +30,6 @@
/*START_INCLUDE*/
#include "balance_estimate_config.h"
-#include "./balance_estimate_tab.h"
#include "./balance_estimate_data.h"
#include "./balance_estimate_hist.h"
#include "./utils_dates.h"
@@ -43,6 +42,7 @@
#include "./traitement_variables.h"
#include "./utils.h"
#include "./utils_str.h"
+#include "./balance_estimate_data.h"
#include "./structures.h"
#include "./include.h"
#include "./erreur.h"
Index: balance_estimate_tab.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/balance_estimate_tab.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- balance_estimate_tab.h 18 Apr 2010 07:53:06 -0000 1.15
+++ balance_estimate_tab.h 4 May 2010 12:27:52 -0000 1.16
@@ -27,13 +27,11 @@
/* START_DECLARATION */
GtkWidget *bet_array_create_page ( void );
-gboolean bet_array_initializes_account_settings ( gint account_number );
void bet_array_list_add_new_hist_line ( GtkTreeModel *tab_model,
GtkTreeModel *model,
GtkTreeIter *iter,
GDate *date_min,
GDate *date_max );
-void bet_array_refresh_estimate_tab ( gint account_number );
void bet_array_update_estimate_tab ( gint account_number );
/* END_DECLARATION */
Index: traitement_variables.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/traitement_variables.c,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -d -r1.193 -r1.194
--- traitement_variables.c 5 Apr 2010 21:24:53 -0000 1.193
+++ traitement_variables.c 4 May 2010 12:27:53 -0000 1.194
@@ -128,10 +128,15 @@
GdkColor couleur_bleue;
GdkColor couleur_jaune;
+
+/* colors for the balance estimate modul */
GdkColor couleur_bet_division;
GdkColor default_couleur_bet_division;
GdkColor couleur_bet_future;
GdkColor default_couleur_bet_future;
+GdkColor couleur_bet_transfert;
+GdkColor default_couleur_bet_transfert;
+
GSList *liste_labels_titres_colonnes_liste_ope = NULL;
@@ -524,6 +529,15 @@
default_couleur_bet_future.red = 31829;
default_couleur_bet_future.green = 51015;
default_couleur_bet_future.blue = 35908;
+
+ /* colors of the background bet transfert data */
+ couleur_bet_transfert.red = 31829;
+ couleur_bet_transfert.green = 51015;
+ couleur_bet_transfert.blue = 35908;
+
+ default_couleur_bet_transfert.red = 60035;
+ default_couleur_bet_transfert.green = 37622;
+ default_couleur_bet_transfert.blue = 59956;
}
/*****************************************************************************************************/
Index: tiers_onglet.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/tiers_onglet.c,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- tiers_onglet.c 3 Apr 2010 19:57:42 -0000 1.172
+++ tiers_onglet.c 4 May 2010 12:27:53 -0000 1.173
@@ -68,9 +68,9 @@
static GtkWidget *creation_barre_outils_tiers ( void );
static gboolean edit_payee ( GtkTreeView * view );
static void gsb_assistant_payees_clicked ( GtkButton *button, GtkWidget *assistant );
-static gboolean gsb_assistant_payees_enter_page_2 ( GtkWidget *assistant );
-static gboolean gsb_assistant_payees_enter_page_3 ( GtkWidget *assistant );
-static gboolean gsb_assistant_payees_enter_page_finish ( GtkWidget *assistant );
+static gboolean gsb_assistant_payees_enter_page_2 ( GtkWidget *assistant );
+static gboolean gsb_assistant_payees_enter_page_3 ( GtkWidget *assistant );
+static gboolean gsb_assistant_payees_enter_page_finish ( GtkWidget *assistant );
static void gsb_assistant_payees_entry_changed ( GtkEditable *editable,
GtkWidget *assistant );
static void gsb_assistant_payees_modifie_operations ( GSList *sup_payees,
@@ -79,9 +79,9 @@
gboolean save_notes,
gboolean extract_num,
gboolean is_transaction );
-static GtkWidget *gsb_assistant_payees_page_2 ( GtkWidget *assistant );
-static GtkWidget *gsb_assistant_payees_page_3 ( GtkWidget *assistant );
-static GtkWidget *gsb_assistant_payees_page_finish ( GtkWidget *assistant );
+static GtkWidget *gsb_assistant_payees_page_2 ( GtkWidget *assistant );
+static GtkWidget *gsb_assistant_payees_page_3 ( GtkWidget *assistant );
+static GtkWidget *gsb_assistant_payees_page_finish ( GtkWidget *assistant );
static gboolean gsb_assistant_payees_select_func (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
Index: barre_outils.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/barre_outils.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- barre_outils.c 5 Apr 2010 21:24:53 -0000 1.133
+++ barre_outils.c 4 May 2010 12:27:52 -0000 1.134
@@ -51,7 +51,7 @@
static gboolean popup_scheduled_view_mode_menu ( GtkWidget * button );
static gboolean popup_transaction_rules_menu ( GtkWidget * button,
gpointer null );
-static gboolean popup_transaction_view_mode_menu ( GtkWidget * button,
+static gboolean popup_transaction_view_mode_menu ( GtkWidget * button,
gpointer null );
/*END_STATIC*/
Index: gsb_account_property.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_account_property.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- gsb_account_property.c 24 Apr 2010 05:39:25 -0000 1.53
+++ gsb_account_property.c 4 May 2010 12:27:52 -0000 1.54
@@ -68,7 +68,6 @@
#include "./gsb_form_scheduler.h"
#include "./include.h"
#include "./erreur.h"
-#include "./gtk_combofix.h"
/*END_INCLUDE*/
/*START_STATIC*/
Index: gsb_data_reconcile.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_reconcile.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- gsb_data_reconcile.c 10 Jan 2010 20:11:37 -0000 1.22
+++ gsb_data_reconcile.c 4 May 2010 12:27:53 -0000 1.23
@@ -57,7 +57,7 @@
/*START_STATIC*/
-static void _gsb_data_reconcile_free ( struct_reconcile *reconcile );
+static void _gsb_data_reconcile_free ( struct_reconcile *reconcile );
static gint gsb_data_reconcile_cmp_int (struct_reconcile *reconcile_1,
struct_reconcile *reconcile_2);
static gpointer gsb_data_reconcile_get_structure ( gint reconcile_number );
Index: gsb_data_account.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_account.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- gsb_data_account.c 17 Apr 2010 15:37:03 -0000 1.103
+++ gsb_data_account.c 4 May 2010 12:27:53 -0000 1.104
@@ -130,7 +130,7 @@
/*START_STATIC*/
-static void _gsb_data_account_free ( struct_account* account );
+static void _gsb_data_account_free ( struct_account* account );
static void gsb_data_account_delete_all_accounts (void);
static struct_account *gsb_data_account_get_structure ( gint no );
static gint gsb_data_account_max_number ( void );
@@ -3130,6 +3130,11 @@
}
+/**
+ *
+ *
+ *
+ * */
gboolean gsb_data_account_bet_update_initial_date_if_necessary ( gint account_number )
{
GDate *date_jour;
Index: gsb_data_fyear.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_fyear.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- gsb_data_fyear.c 14 Feb 2010 17:48:50 -0000 1.22
+++ gsb_data_fyear.c 4 May 2010 12:27:53 -0000 1.23
@@ -48,7 +48,7 @@
};
/*START_STATIC*/
-static void _gsb_data_fyear_free ( struct_fyear *fyear );
+static void _gsb_data_fyear_free ( struct_fyear *fyear );
static gpointer gsb_data_fyear_get_structure ( gint fyear_number );
static gint gsb_data_fyear_max_number ( void );
/*END_STATIC*/
Index: balance_estimate_data.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/balance_estimate_data.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- balance_estimate_data.h 18 Apr 2010 07:53:06 -0000 1.15
+++ balance_estimate_data.h 4 May 2010 12:27:52 -0000 1.16
@@ -12,6 +12,7 @@
typedef struct _historical SH;
typedef struct _hist_div struct_hist_div;
typedef struct _future_data struct_futur_data;
+typedef struct _transfert_data struct_transfert_data;
struct _bet_range
{
@@ -65,6 +66,22 @@
};
+struct _transfert_data
+{
+ gint number;
+ gint account_number;
+ gint type;
+ gint replace_account;
+ gint replace_transaction;
+ gint auto_inc_month;
+ GDate *date;
+ gint category_number;
+ gint sub_category_number;
+ gint budgetary_number;
+ gint sub_budgetary_number;
+};
+
+
enum type_maj
{
BET_MAJ_FALSE = 0,
@@ -117,9 +134,15 @@
gboolean bet_data_set_div_ptr ( gint type_div );
void bet_data_set_maj ( gint account_number, gint type_maj );
void bet_data_synchronise_hist_div_list ( GHashTable *list_div );
+gboolean bet_data_transfert_add_line ( struct_transfert_data *transfert );
+GHashTable *bet_data_transfert_get_list ( void );
+gboolean bet_data_transfert_modify_line ( struct_transfert_data *transfert );
+gboolean bet_data_transfert_remove_line ( gint account_number, gint number );
+gboolean bet_data_transfert_set_line_from_file ( struct_transfert_data *transfert );
void struct_free_bet_historical ( SH *sh );
struct_futur_data *struct_initialise_bet_future ( void );
SBR *struct_initialise_bet_range ( void );
+struct_transfert_data *struct_initialise_bet_transfert ( void );
struct_hist_div *struct_initialise_hist_div ( void );
/* END_DECLARATION */
Index: balance_estimate_tab.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/balance_estimate_tab.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- balance_estimate_tab.c 24 Apr 2010 05:39:25 -0000 1.66
+++ balance_estimate_tab.c 4 May 2010 12:27:52 -0000 1.67
@@ -49,6 +49,7 @@
#include "./gsb_data_account.h"
#include "./gsb_data_budget.h"
#include "./gsb_data_category.h"
+#include "./gsb_data_partial_balance.h"
#include "./gsb_data_payee.h"
#include "./gsb_data_scheduled.h"
#include "./gsb_data_transaction.h"
@@ -59,14 +60,13 @@
#include "./gsb_transactions_list.h"
#include "./traitement_variables.h"
#include "./transaction_list_select.h"
+#include "./balance_estimate_data.h"
#include "./structures.h"
#include "./fenetre_principale.h"
#include "./mouse.h"
-#include "./balance_estimate_data.h"
#include "./balance_estimate_hist.h"
#include "./include.h"
#include "./erreur.h"
-#include "./gsb_real.h"
/*END_INCLUDE*/
@@ -80,9 +80,10 @@
GtkTreeIter *itera,
GtkTreeIter *iterb,
gpointer data );
-static gboolean bet_array_entry_key_press ( GtkWidget *entry,
+static gboolean bet_array_entry_key_press ( GtkWidget *entry,
GdkEventKey *ev,
gpointer data );
+static gboolean bet_array_initializes_account_settings ( gint account_number );
static void bet_array_list_add_substract_menu ( GtkWidget *menu_item,
GtkTreeSelection *tree_selection );
static gboolean bet_array_list_button_press ( GtkWidget *tree_view,
@@ -97,6 +98,8 @@
static gchar *bet_array_list_get_description ( gint account_number,
gint origine,
gpointer value );
+static void bet_array_list_insert_account_balance_menu ( GtkWidget *menu_item,
+ GtkTreeSelection *tree_selection );
static void bet_array_list_insert_menu ( GtkWidget *menu_item,
GtkTreeSelection *tree_selection );
static void bet_array_list_redo_menu ( GtkWidget *menu_item,
@@ -107,6 +110,7 @@
static gboolean bet_array_list_set_background_color ( GtkWidget *tree_view );
static void bet_array_list_traite_double_click ( GtkTreeView *tree_view );
static void bet_array_list_update_balance ( GtkTreeModel *model );
+static void bet_array_refresh_estimate_tab ( gint account_number );
static gboolean bet_array_refresh_futur_data ( GtkTreeModel *tab_model,
GDate *date_min,
GDate *date_max );
@@ -118,10 +122,13 @@
gint selected_account,
GDate *date_min,
GDate *date_max );
+static gboolean bet_array_refresh_transfert_data ( GtkTreeModel *tab_model,
+ GDate *date_min,
+ GDate *date_max );
static gboolean bet_array_sort_scheduled_transactions ( gint div_number,
gint sub_div_nb,
GtkTreeModel *model );
-static gboolean bet_array_start_date_focus_out ( GtkWidget *entry,
+static gboolean bet_array_start_date_focus_out ( GtkWidget *entry,
GdkEventFocus *ev,
gpointer data );
static gboolean bet_array_update_average_column ( GtkTreeModel *model,
@@ -134,6 +141,7 @@
extern gchar* bet_duration_array[];
extern GdkColor couleur_bet_division;
extern GdkColor couleur_bet_future;
+extern GdkColor couleur_bet_transfert;
extern GdkColor couleur_fond[2];
extern gint mise_a_jour_liste_echeances_auto_accueil;
extern GtkWidget *notebook_general;
@@ -451,7 +459,7 @@
/* search data from the futur */
bet_array_refresh_futur_data ( tree_model, date_min, date_max );
-
+
/* search transactions of the account which are in the period */
bet_array_refresh_transactions_data ( tree_model,
account_number,
@@ -464,6 +472,9 @@
date_min,
date_max );
+ /* search data from a transfer */
+ bet_array_refresh_transfert_data ( tree_model, date_min, date_max );
+
g_date_free ( date_min );
g_date_free ( date_init );
g_date_free ( date_max );
@@ -1186,7 +1197,7 @@
bet_data_get_selected_currency ( ), TRUE );
else
str_credit = gsb_real_get_string_with_currency ( scheduled -> amount,
- bet_data_get_selected_currency ( ), TRUE );;
+ bet_data_get_selected_currency ( ), TRUE );
str_date = gsb_format_gdate ( scheduled -> date );
@@ -1252,6 +1263,7 @@
*/
void bet_array_list_context_menu ( GtkWidget *tree_view )
{
+ GtkWidget *image;
GtkWidget *menu, *menu_item;
GtkTreeModel *model;
GtkTreeSelection *tree_selection;
@@ -1259,6 +1271,7 @@
GDate *date;
GDate *date_jour;
gchar *str_date;
+ gchar *tmp_str;
gboolean select = FALSE;
gint origine;
@@ -1391,13 +1404,43 @@
G_CALLBACK ( bet_array_list_schedule_selected_line ),
tree_selection );
gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), menu_item );
- break;
+ break;
}
/* Separator */
gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), gtk_separator_menu_item_new ( ) );
gtk_widget_show ( menu_item );
+ /* Insert an account balance */
+ tmp_str = g_build_filename ( PIXMAPS_DIR, "ac_bank_16.png", NULL);
+ image = gtk_image_new_from_file ( tmp_str );
+ g_free ( tmp_str );
+ menu_item = gtk_image_menu_item_new_with_label (
+ _("Insert the balance of a cash account") );
+ gtk_image_menu_item_set_image ( GTK_IMAGE_MENU_ITEM ( menu_item ), image );
+ g_signal_connect ( G_OBJECT ( menu_item ),
+ "activate",
+ G_CALLBACK ( bet_array_list_insert_account_balance_menu ),
+ tree_selection );
+ gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), menu_item );
+
+ if ( origine == SPP_ORIGIN_ACCOUNT )
+ {
+ menu_item = gtk_image_menu_item_new_with_label ( _("Delete selection") );
+ gtk_image_menu_item_set_image ( GTK_IMAGE_MENU_ITEM ( menu_item ),
+ gtk_image_new_from_stock ( GTK_STOCK_DELETE,
+ GTK_ICON_SIZE_MENU ) );
+ g_signal_connect ( G_OBJECT ( menu_item ),
+ "activate",
+ G_CALLBACK ( bet_array_list_delete_menu ),
+ tree_selection );
+ gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), menu_item );
+ }
+
+ /* Separator */
+ gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), gtk_separator_menu_item_new() );
+ gtk_widget_show ( menu_item );
+
/* redo item */
menu_item = gtk_image_menu_item_new_with_label ( _("Reset data") );
gtk_image_menu_item_set_image ( GTK_IMAGE_MENU_ITEM ( menu_item ),
@@ -1480,6 +1523,8 @@
}
else if ( origine == SPP_ORIGIN_FUTURE )
bet_future_modify_line ( gsb_gui_navigation_get_current_account ( ), number, mother_row );
+ else if ( origine == SPP_ORIGIN_ACCOUNT )
+ bet_transfert_modify_line ( gsb_gui_navigation_get_current_account ( ), number );
}
@@ -1508,9 +1553,29 @@
SPP_ESTIMATE_TREE_DIVISION_COLUMN, &number,
-1 );
- gtk_tree_store_remove ( GTK_TREE_STORE ( model ), &iter );
- if ( origine == SPP_ORIGIN_FUTURE )
+ if ( origine == SPP_ORIGIN_HISTORICAL )
+ {
+ gint account_number;
+ gint sub_div_nb;
+
+ account_number = gsb_gui_navigation_get_current_account ( );
+ gtk_tree_model_get ( GTK_TREE_MODEL ( model ), &iter,
+ SPP_ESTIMATE_TREE_SUB_DIV_COLUMN, &sub_div_nb,
+ -1 );
+ bet_data_remove_div_hist ( account_number, number, sub_div_nb );
+ bet_data_set_maj ( account_number, BET_MAJ_HISTORICAL );
+ }
+ else if ( origine == SPP_ORIGIN_FUTURE )
+ {
bet_data_future_remove_line ( gsb_gui_navigation_get_current_account ( ), number );
+ }
+ else if ( origine == SPP_ORIGIN_ACCOUNT )
+ {
+ bet_data_transfert_remove_line ( gsb_gui_navigation_get_current_account ( ), number );
+ }
+
+ gtk_tree_store_remove ( GTK_TREE_STORE ( model ), &iter );
+
tree_view = gtk_tree_selection_get_tree_view ( tree_selection );
bet_array_list_set_background_color ( GTK_WIDGET ( tree_view ) );
bet_array_list_update_balance ( model );
@@ -1563,7 +1628,6 @@
void bet_array_list_insert_menu ( GtkWidget *menu_item,
GtkTreeSelection *tree_selection )
{
- GtkTreeView *tree_view;
GtkTreeModel *model;
GtkTreeIter iter;
gchar *str_date;
@@ -1577,9 +1641,32 @@
-1 );
bet_future_new_line_dialog ( model, str_date );
- tree_view = gtk_tree_selection_get_tree_view ( tree_selection );
- bet_array_list_set_background_color ( GTK_WIDGET ( tree_view ) );
- bet_array_list_update_balance ( model );
+}
+
+
+/**
+ * insert an account balance
+ *
+ * /param menu item
+ * /param row selected
+ *
+ * */
+void bet_array_list_insert_account_balance_menu ( GtkWidget *menu_item,
+ GtkTreeSelection *tree_selection )
+{
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ gchar *str_date;
+
+ if ( !gtk_tree_selection_get_selected ( GTK_TREE_SELECTION ( tree_selection ),
+ &model, &iter ) )
+ return;
+
+ gtk_tree_model_get ( GTK_TREE_MODEL ( model ), &iter,
+ SPP_ESTIMATE_TREE_DATE_COLUMN, &str_date,
+ -1 );
+
+ bet_transfert_new_line_dialog ( model, str_date );
}
@@ -1876,6 +1963,12 @@
SPP_ESTIMATE_TREE_BACKGROUND_COLOR, &couleur_bet_future,
-1 );
break;
+ case SPP_ORIGIN_ACCOUNT:
+ gtk_tree_store_set ( GTK_TREE_STORE ( model ),
+ &iter,
+ SPP_ESTIMATE_TREE_BACKGROUND_COLOR, &couleur_bet_transfert,
+ -1 );
+ break;
}
}
while ( gtk_tree_model_iter_next ( GTK_TREE_MODEL ( model ), &iter ) );
@@ -2268,6 +2361,17 @@
break;
}
}
+ else if ( origine == SPP_ORIGIN_ACCOUNT )
+ {
+ struct_transfert_data *transfert = ( struct_transfert_data * ) value;
+
+ if ( transfert -> type == 0 )
+ desc = g_strdup_printf ("Solde du compte : %s",
+ gsb_data_account_get_name ( transfert -> replace_account ) );
+ else
+ desc = g_strdup_printf ("Solde partiel : %s",
+ gsb_data_partial_balance_get_name ( transfert -> replace_account ) );
+ }
return desc;
}
@@ -2296,6 +2400,111 @@
modification_fichier ( TRUE );
}
}
+
+
+/**
+ *
+ *
+ *
+ *
+ * */
+gboolean bet_array_refresh_transfert_data ( GtkTreeModel *tab_model,
+ GDate *date_min,
+ GDate *date_max )
+{
+ GHashTable *transfert_list;
+ GHashTableIter iter;
+ gpointer key, value;
+ gint account_number;
+
+ devel_debug (NULL);
+
+ account_number = gsb_gui_navigation_get_current_account ( );
+ transfert_list = bet_data_transfert_get_list ( );
+
+ g_hash_table_iter_init ( &iter, transfert_list );
+ while ( g_hash_table_iter_next ( &iter, &key, &value ) )
+ {
+ struct_transfert_data *transfert = ( struct_transfert_data *) value;
+ GtkTreeIter tab_iter;
+ GValue date_value = {0, };
+ gchar *str_debit = NULL;
+ gchar *str_credit = NULL;
+ gchar *str_date;
+ gchar *str_description;
+ gchar *str_amount;
+ gsb_real amount;
+
+ if ( account_number != transfert -> account_number )
+ continue;
+
+ if ( g_date_compare ( transfert -> date, date_max ) > 0 )
+ continue;
+ if ( g_date_compare ( transfert -> date, date_min ) < 0 )
+ continue;
+
+ str_description = bet_array_list_get_description ( transfert -> replace_account,
+ SPP_ORIGIN_ACCOUNT,
+ value );
+
+ if ( transfert -> type == 0 )
+ {
+ amount = gsb_data_account_get_current_balance ( transfert -> replace_account );
+ str_amount = gsb_real_save_real_to_string ( amount, 2 );
+ }
+ else
+ {
+ amount = gsb_data_partial_balance_get_current_amount (
+ transfert -> replace_account );
+ str_amount = gsb_real_save_real_to_string ( amount, 2 );
+ }
+
+ if ( amount.mantissa < 0 )
+ str_debit = gsb_transfert_get_str_amount ( transfert,
+ gsb_real_opposite ( amount ) );
+ else
+ str_credit = gsb_transfert_get_str_amount ( transfert, amount );
+
+ str_date = gsb_format_gdate ( transfert -> date );
+
+ g_value_init ( &date_value, G_TYPE_DATE );
+ g_value_set_boxed ( &date_value, transfert -> date );
+
+ /* add a line in the estimate array */
+ gtk_tree_store_append ( GTK_TREE_STORE ( tab_model ), &tab_iter, NULL );
+ gtk_tree_store_set_value ( GTK_TREE_STORE ( tab_model ), &tab_iter,
+ SPP_ESTIMATE_TREE_SORT_DATE_COLUMN,
+ &date_value );
+ gtk_tree_store_set ( GTK_TREE_STORE ( tab_model ), &tab_iter,
+ SPP_ESTIMATE_TREE_ORIGIN_DATA, SPP_ORIGIN_ACCOUNT,
+ SPP_ESTIMATE_TREE_DIVISION_COLUMN, transfert -> number,
+ SPP_ESTIMATE_TREE_DATE_COLUMN, str_date,
+ SPP_ESTIMATE_TREE_DESC_COLUMN, str_description,
+ SPP_ESTIMATE_TREE_DEBIT_COLUMN, str_debit,
+ SPP_ESTIMATE_TREE_CREDIT_COLUMN, str_credit,
+ SPP_ESTIMATE_TREE_AMOUNT_COLUMN, str_amount,
+ -1);
+
+ g_value_unset ( &date_value );
+ g_free ( str_date );
+ g_free ( str_description );
+ g_free ( str_amount );
+ if ( str_debit )
+ g_free ( str_debit );
+ if ( str_credit )
+ g_free ( str_credit );
+ }
+
+ return FALSE;
+}
+
+
+/**
+ *
+ *
+ *
+ *
+ * */
/* Local Variables: */
/* c-basic-offset: 4 */
/* End: */
Index: structures.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/structures.h,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -d -r1.246 -r1.247
--- structures.h 24 Apr 2010 05:39:25 -0000 1.246
+++ structures.h 4 May 2010 12:27:53 -0000 1.247
@@ -13,7 +13,7 @@
#define VERSION_FICHIER "0.6.0"
/* Define this when in CVS development branch. */
-#define IS_DEVELOPMENT_VERSION 0
+#define IS_DEVELOPMENT_VERSION 1
#define VERSION_FICHIER_ETAT "0.6.0"
#define VERSION_FICHIER_CATEG "0.6.0"
@@ -189,7 +189,8 @@
SPP_ORIGIN_TRANSACTION,
SPP_ORIGIN_SCHEDULED,
SPP_ORIGIN_HISTORICAL,
- SPP_ORIGIN_FUTURE
+ SPP_ORIGIN_FUTURE,
+ SPP_ORIGIN_ACCOUNT
};
Index: transaction_list_sort.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/transaction_list_sort.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- transaction_list_sort.h 28 Aug 2008 21:49:40 -0000 1.1
+++ transaction_list_sort.h 4 May 2010 12:27:53 -0000 1.2
@@ -8,10 +8,10 @@
/* START_DECLARATION */
void transaction_list_sort (void);
void transaction_list_sort_get_column ( gint *sort_col,
- GtkSortType *sort_order );
+ GtkSortType *sort_order );
gboolean transaction_list_sort_get_reconcile_sort ( void );
void transaction_list_sort_set_column ( gint new_sort_col,
- GtkSortType new_sort_order );
+ GtkSortType new_sort_order );
void transaction_list_sort_set_reconcile_sort ( gboolean use_reconcile_sort );
/* END_DECLARATION */
#endif
Index: qif.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/qif.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- qif.c 5 Apr 2010 21:24:53 -0000 1.145
+++ qif.c 4 May 2010 12:27:53 -0000 1.146
@@ -46,9 +46,9 @@
/*END_INCLUDE*/
/*START_STATIC*/
-static GDate *gsb_qif_get_date ( gchar *date_string, gint order );
-static gchar **gsb_qif_get_date_content ( gchar *date_string );
-static gint gsb_qif_get_date_order ( GSList *transactions_list );
+static GDate *gsb_qif_get_date ( gchar *date_string, gint order );
+static gchar **gsb_qif_get_date_content ( gchar *date_string );
+static gint gsb_qif_get_date_order ( GSList *transactions_list );
/*END_STATIC*/
/*START_EXTERN*/
Index: gsb_assistant_first.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_assistant_first.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- gsb_assistant_first.c 8 Mar 2010 21:30:00 -0000 1.29
+++ gsb_assistant_first.c 4 May 2010 12:27:52 -0000 1.30
@@ -44,12 +44,12 @@
/*END_INCLUDE*/
/*START_STATIC*/
-static gboolean gsb_assistant_first_enter_page_2 ( GtkWidget *assistant,
+static gboolean gsb_assistant_first_enter_page_2 ( GtkWidget *assistant,
gint new_page );
-static gboolean gsb_assistant_first_enter_page_3 ( GtkWidget *assistant,
+static gboolean gsb_assistant_first_enter_page_3 ( GtkWidget *assistant,
gint new_page );
-static GtkWidget *gsb_assistant_first_page_2 ( GtkWidget *assistant );
-static GtkWidget *gsb_assistant_first_page_3 ( GtkWidget *assistant );
+static GtkWidget *gsb_assistant_first_page_2 ( GtkWidget *assistant );
+static GtkWidget *gsb_assistant_first_page_3 ( GtkWidget *assistant );
/*END_STATIC*/
/*START_EXTERN*/
Index: gsb_data_budget.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_budget.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- gsb_data_budget.c 28 Feb 2010 08:40:57 -0000 1.56
+++ gsb_data_budget.c 4 May 2010 12:27:53 -0000 1.57
@@ -83,8 +83,8 @@
/*START_STATIC*/
-static void _gsb_data_budget_free ( struct_budget* budget );
-static void _gsb_data_sub_budget_free ( struct_sub_budget* sub_budget );
+static void _gsb_data_budget_free ( struct_budget* budget );
+static void _gsb_data_sub_budget_free ( struct_sub_budget* sub_budget );
static GSList *gsb_data_budget_append_sub_budget_to_list ( GSList *budget_list,
GSList *sub_budget_list );
static gint gsb_data_budget_get_pointer_from_name_in_glist ( struct_budget *budget,
Index: parse_cmdline.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/parse_cmdline.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- parse_cmdline.c 28 Apr 2010 16:19:58 -0000 1.18
+++ parse_cmdline.c 4 May 2010 12:27:53 -0000 1.19
@@ -33,7 +33,7 @@
static CMDLINE_ERRNO parse_tab_parameters(char *tab_parameters, cmdline_options* pOpt);
static void show_errstr(gint errval, gchar* extra);
static void show_help(void);
-static void show_usage(gint errval, gchar* extra);
+static void show_usage ( gint errval, gchar* extra );
static void show_version(void);
/*END_STATIC*/
Index: gsb_data_report_text_comparison.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_report_text_comparison.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- gsb_data_report_text_comparison.c 12 Jun 2009 19:06:56 -0000 1.17
+++ gsb_data_report_text_comparison.c 4 May 2010 12:27:53 -0000 1.18
@@ -87,8 +87,8 @@
/*START_STATIC*/
-static void _gsb_data_report_text_comparison_free ( struct_text_comparison* text_comparison );
-static struct_text_comparison *gsb_data_report_text_comparison_get_struct_by_no ( gint text_comparison_number );
+static void _gsb_data_report_text_comparison_free ( struct_text_comparison* text_comparison );
+static struct_text_comparison *gsb_data_report_text_comparison_get_struct_by_no ( gint text_comparison_number );
static gint gsb_data_report_text_comparison_max_number ( void );
/*END_STATIC*/
Index: gsb_archive_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_archive_config.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- gsb_archive_config.c 10 Jan 2010 20:11:37 -0000 1.29
+++ gsb_archive_config.c 4 May 2010 12:27:52 -0000 1.30
@@ -67,14 +67,14 @@
/*START_STATIC*/
-static gboolean gsb_archive_config_delete_archive ( GtkWidget *button,
+static gboolean gsb_archive_config_delete_archive ( GtkWidget *button,
GtkWidget *tree_view );
-static gboolean gsb_archive_config_destroy_archive ( GtkWidget *button,
+static gboolean gsb_archive_config_destroy_archive ( GtkWidget *button,
GtkWidget *tree_view );
-static void gsb_archive_config_fill_list ( GtkListStore *store );
-static gboolean gsb_archive_config_name_changed ( GtkWidget *entry,
+static void gsb_archive_config_fill_list ( GtkListStore *store );
+static gboolean gsb_archive_config_name_changed ( GtkWidget *entry,
GtkWidget *tree_view );
-static gboolean gsb_archive_config_select ( GtkTreeSelection *selection,
+static gboolean gsb_archive_config_select ( GtkTreeSelection *selection,
GtkWidget *paddingbox );
/*END_STATIC*/
Index: affichage.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/affichage.c,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- affichage.c 5 Apr 2010 21:24:53 -0000 1.173
+++ affichage.c 4 May 2010 12:27:52 -0000 1.174
@@ -62,14 +62,14 @@
static gboolean modification_logo_accueil ( );
static gboolean preferences_switch_headings_bar ( GtkWidget *toggle_button,
gpointer null );
-static gboolean preferences_view_color_changed ( GtkWidget *color_button,
+static gboolean preferences_view_color_changed ( GtkWidget *color_button,
GtkWidget *combobox );
-static gboolean preferences_view_color_combobox_changed ( GtkWidget *combobox,
+static gboolean preferences_view_color_combobox_changed ( GtkWidget *combobox,
GtkWidget *color_button );
-static gboolean preferences_view_color_default ( GtkWidget *button,
+static gboolean preferences_view_color_default ( GtkWidget *button,
GtkWidget *combobox );
-static GtkWidget *preferences_view_create_color_combobox (void);
-static gboolean preferences_view_update_preview_logo ( GtkFileChooser *file_chooser,
+static GtkWidget *preferences_view_create_color_combobox (void);
+static gboolean preferences_view_update_preview_logo ( GtkFileChooser *file_chooser,
GtkWidget *preview );
static void update_fonte_listes ( gchar *fontname,
gpointer null);
@@ -83,6 +83,7 @@
extern GdkColor calendar_entry_color;
extern GdkColor couleur_bet_division;
extern GdkColor couleur_bet_future;
+extern GdkColor couleur_bet_transfert;
extern GdkColor couleur_fond[2];
extern GdkColor couleur_grise;
extern GdkColor couleur_jour;
@@ -91,6 +92,7 @@
extern GdkColor default_calendar_entry_color;
extern GdkColor default_couleur_bet_division;
extern GdkColor default_couleur_bet_future;
+extern GdkColor default_couleur_bet_transfert;
extern GdkColor default_couleur_fond[2];
extern GdkColor default_couleur_grise;
extern GdkColor default_couleur_jour;
@@ -797,6 +799,7 @@
{ N_("Background of invalid date entry"), &calendar_entry_color, &default_calendar_entry_color },
{ N_("Background of bet division"), &couleur_bet_division, &default_couleur_bet_division },
{ N_("Background of bet futur"), &couleur_bet_future, &default_couleur_bet_future },
+ { N_("Background of bet transfer"), &couleur_bet_transfert, &default_couleur_bet_transfert },
{ NULL, 0, 0},
};
Index: gsb_automem.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_automem.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- gsb_automem.c 5 Apr 2010 21:24:53 -0000 1.28
+++ gsb_automem.c 4 May 2010 12:27:52 -0000 1.29
@@ -45,11 +45,11 @@
/*END_INCLUDE*/
/*START_STATIC*/
-static gboolean gsb_automem_checkbutton_changed ( GtkWidget *checkbutton,
+static gboolean gsb_automem_checkbutton_changed ( GtkWidget *checkbutton,
gpointer null );
-static gboolean gsb_automem_entry_changed (GtkWidget *entry,
+static gboolean gsb_automem_entry_changed (GtkWidget *entry,
gpointer null );
-static gboolean gsb_automem_spin_button_changed ( GtkWidget *spin,
+static gboolean gsb_automem_spin_button_changed ( GtkWidget *spin,
gpointer null);
static GtkWidget *gsb_automem_spin_button_new_full ( gint *value,
gdouble lower, gdouble upper,
@@ -57,7 +57,7 @@
gdouble page_size,
gdouble climb_rate,
GCallback hook, gpointer data );
-static gboolean gsb_automem_textview_changed ( GtkTextBuffer *buffer,
+static gboolean gsb_automem_textview_changed ( GtkTextBuffer *buffer,
gpointer null );
/*END_STATIC*/
Index: import.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/import.c,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -d -r1.332 -r1.333
--- import.c 18 Apr 2010 07:53:06 -0000 1.332
+++ import.c 4 May 2010 12:27:53 -0000 1.333
@@ -71,6 +71,7 @@
#include "./qif.h"
#include "./transaction_list.h"
#include "./utils_files.h"
+#include "./balance_estimate_data.h"
#include "./structures.h"
#include "./gsb_transactions_list.h"
#include "./go-charmap-sel.h"
@@ -102,7 +103,7 @@
static void gsb_import_add_imported_transactions ( struct struct_compte_importation *imported_account,
gint account_number );
static void gsb_import_associations_add_assoc ( GtkWidget *button, GtkWidget *main_widget );
-static void gsb_import_associations_cell_edited (GtkCellRendererText *cell,
+static void gsb_import_associations_cell_edited (GtkCellRendererText *cell,
const gchar *path_string,
const gchar *new_text,
GObject * main_widget );
Index: affichage_liste.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/affichage_liste.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- affichage_liste.c 5 Apr 2010 21:24:53 -0000 1.122
+++ affichage_liste.c 4 May 2010 12:27:52 -0000 1.123
@@ -46,7 +46,7 @@
/*END_INCLUDE*/
/*START_STATIC*/
-static gboolean display_mode_button_changed ( GtkWidget *button,
+static gboolean display_mode_button_changed ( GtkWidget *button,
gint *line_ptr );
static gboolean gsb_transactions_list_display_change_max_items ( GtkWidget *entry,
gpointer null );
Index: gsb_file_load.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_load.c,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -d -r1.221 -r1.222
--- gsb_file_load.c 24 Apr 2010 05:39:25 -0000 1.221
+++ gsb_file_load.c 4 May 2010 12:27:53 -0000 1.222
@@ -68,6 +68,7 @@
#include "./custom_list.h"
#include "./gsb_data_account.h"
#include "./gsb_data_form.h"
+#include "./utils_str.h"
#include "./gsb_data_transaction.h"
#include "./gsb_scheduler_list.h"
#include "./structures.h"
@@ -90,10 +91,14 @@
const gchar **attribute_values );
static void gsb_file_load_bank ( const gchar **attribute_names,
const gchar **attribute_values );
+static void gsb_file_load_bet_future_data ( const gchar **attribute_names,
+ const gchar **attribute_values );
static void gsb_file_load_bet_historical ( const gchar **attribute_names,
const gchar **attribute_values );
static void gsb_file_load_bet_part ( const gchar **attribute_names,
const gchar **attribute_values );
+static void gsb_file_load_bet_transfert_part ( const gchar **attribute_names,
+ const gchar **attribute_values );
static gboolean gsb_file_load_check_new_structure ( gchar *file_content );
static void gsb_file_load_color_part ( const gchar **attribute_names,
const gchar **attribute_values );
@@ -108,8 +113,6 @@
GError **error);
static void gsb_file_load_financial_year ( const gchar **attribute_names,
const gchar **attribute_values );
-static void gsb_file_load_future_data ( const gchar **attribute_names,
- const gchar **attribute_values );
static void gsb_file_load_general_part ( const gchar **attribute_names,
const gchar **attribute_values );
static void gsb_file_load_general_part_before_0_6 ( GMarkupParseContext *context,
@@ -168,6 +171,7 @@
extern GdkColor calendar_entry_color;
extern GdkColor couleur_bet_division;
extern GdkColor couleur_bet_future;
+extern GdkColor couleur_bet_transfert;
extern GdkColor couleur_fond[2];
extern GdkColor couleur_grise;
extern GdkColor couleur_jour;
@@ -644,9 +648,16 @@
if ( !strcmp ( element_name, "Bet_future" ) )
{
- gsb_file_load_future_data ( attribute_names, attribute_values );
+ gsb_file_load_bet_future_data ( attribute_names, attribute_values );
return;
}
+
+ if ( !strcmp ( element_name, "Bet_transfert" ) )
+ {
+ gsb_file_load_bet_transfert_part ( attribute_names, attribute_values );
+ return;
+ }
+
#endif /* ENABLE_BALANCE_ESTIMATE */
if ( !strcmp ( element_name,
@@ -1274,6 +1285,24 @@
couleur_bet_future.blue = utils_str_atoi (attribute_values[i]);
}
+ else if ( !strcmp ( attribute_names[i],
+ "Couleur_bet_transfert_red" ))
+ {
+ couleur_bet_transfert.red = utils_str_atoi (attribute_values[i]);
+ }
+
+ else if ( !strcmp ( attribute_names[i],
+ "Couleur_bet_transfert_green" ))
+ {
+ couleur_bet_transfert.green = utils_str_atoi (attribute_values[i]);
+ }
+
+ else if ( !strcmp ( attribute_names[i],
+ "Couleur_bet_transfert_blue" ))
+ {
+ couleur_bet_transfert.blue = utils_str_atoi (attribute_values[i]);
+ }
+
i++;
}
while ( attribute_names[i] );
@@ -3872,7 +3901,7 @@
* \param attribute_values
*
* */
-void gsb_file_load_future_data ( const gchar **attribute_names,
+void gsb_file_load_bet_future_data ( const gchar **attribute_names,
const gchar **attribute_values )
{
gint i=0;
@@ -4035,6 +4064,127 @@
/**
+ * load the bet transfert line
+ *
+ * \param attribute_names
+ * \param attribute_values
+ *
+ * */
+void gsb_file_load_bet_transfert_part ( const gchar **attribute_names,
+ const gchar **attribute_values )
+{
+ gint i=0;
+ struct_transfert_data *transfert;
+
+ if ( !attribute_names[i] )
+ return;
+
+ transfert = struct_initialise_bet_transfert ( );
+
+ if ( !transfert )
+ {
+ dialogue_error_memory ();
+ return;
+ }
+
+ do
+ {
+ /* we test at the beginning if the attribute_value is NULL, if yes, */
+ /* go to the next */
+
+ if ( !strcmp (attribute_values[i], "(null)") )
+ {
+ i++;
+ continue;
+ }
+
+ if ( !strcmp ( attribute_names[i], "Nb" ) )
+ {
+ transfert -> number = utils_str_atoi ( attribute_values[i] );
+ i++;
+ continue;
+ }
+
+ if ( !strcmp ( attribute_names[i], "Dt" ) )
+ {
+ transfert -> date = gsb_parse_date_string_safe ( attribute_values[i] );
+ i++;
+ continue;
+ }
+
+ if ( !strcmp ( attribute_names[i], "Ac" ) )
+ {
+ transfert -> account_number = utils_str_atoi ( attribute_values[i] );
+ i++;
+ continue;
+ }
+
+ if ( !strcmp ( attribute_names[i], "Ty" ) )
+ {
+ transfert -> type = utils_str_atoi ( attribute_values[i] );
+ i++;
+ continue;
+ }
+
+ if ( !strcmp ( attribute_names[i], "Ra" ) )
+ {
+ transfert -> replace_account = utils_str_atoi ( attribute_values[i] );
+ i++;
+ continue;
+ }
+
+ if ( !strcmp ( attribute_names[i], "Rt" ) )
+ {
+ transfert -> replace_transaction = utils_str_atoi ( attribute_values[i] );
+ i++;
+ continue;
+ }
+
+ if ( !strcmp ( attribute_names[i], "Aim" ) )
+ {
+ transfert -> auto_inc_month = utils_str_atoi ( attribute_values[i] );
+ i++;
+ continue;
+ }
+
+ if ( !strcmp ( attribute_names[i], "Ca" ) )
+ {
+ transfert -> category_number = utils_str_atoi ( attribute_values[i] );
+ i++;
+ continue;
+ }
+
+ if ( !strcmp ( attribute_names[i], "Sca" ) )
+ {
+ transfert -> sub_category_number = utils_str_atoi ( attribute_values[i] );
+ i++;
+ continue;
+ }
+
+ if ( !strcmp ( attribute_names[i], "Bu" ) )
+ {
+ transfert -> budgetary_number = utils_str_atoi ( attribute_values[i] );
+ i++;
+ continue;
+ }
+
+ if ( !strcmp ( attribute_names[i], "Sbu" ) )
+ {
+ transfert -> sub_budgetary_number = utils_str_atoi ( attribute_values[i] );
+ i++;
+ continue;
+ }
+
+ /* normally, shouldn't come here */
+ i++;
+ }
+ while ( attribute_names[i] );
+
+ bet_data_transfert_set_line_from_file ( transfert );
+}
+
+
+/**
* load the report structure in the grisbi file
*
* \param attribute_names
Index: transaction_model.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/transaction_model.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- transaction_model.h 2 Oct 2008 22:11:23 -0000 1.2
+++ transaction_model.h 4 May 2010 12:27:53 -0000 1.3
@@ -10,8 +10,6 @@
gboolean transaction_model_get_iter (GtkTreeIter *iter,
GtkTreePath *path);
CustomList *transaction_model_get_model (void);
-GtkTreePath *transaction_model_get_path ( gint transaction_number,
- gint line_in_transaction );
gboolean transaction_model_get_transaction_iter ( GtkTreeIter *iter,
gint transaction_number,
gint line_in_transaction );
Index: gsb_assistant_reconcile_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_assistant_reconcile_config.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- gsb_assistant_reconcile_config.c 9 Jan 2010 20:57:38 -0000 1.29
+++ gsb_assistant_reconcile_config.c 4 May 2010 12:27:52 -0000 1.30
@@ -50,21 +50,21 @@
/*END_INCLUDE*/
/*START_STATIC*/
-static gboolean gsb_assistant_reconcile_config_hide_label_error ( GtkWidget *editable,
+static gboolean gsb_assistant_reconcile_config_hide_label_error ( GtkWidget *editable,
GtkWidget *label );
-static gboolean gsb_assistant_reconcile_config_lauch_auto_asso ( GtkWidget *button,
+static gboolean gsb_assistant_reconcile_config_lauch_auto_asso ( GtkWidget *button,
GtkWidget *assistant );
-static gboolean gsb_assistant_reconcile_config_lauch_manu_asso ( GtkWidget *button,
+static gboolean gsb_assistant_reconcile_config_lauch_manu_asso ( GtkWidget *button,
GtkWidget *assistant );
-static gboolean gsb_assistant_reconcile_config_page_add_new_reconcile ( GtkWidget *button,
+static gboolean gsb_assistant_reconcile_config_page_add_new_reconcile ( GtkWidget *button,
GtkWidget *label );
-static GtkWidget *gsb_assistant_reconcile_config_page_automatically_associate ( GtkWidget *assistant );
-static GtkWidget *gsb_assistant_reconcile_config_page_manually_associate ( GtkWidget *assistant );
-static GtkWidget *gsb_assistant_reconcile_config_page_menu ( GtkWidget *assistant );
-static gboolean gsb_assistant_reconcile_config_page_menu_toggled ( GtkWidget *button,
+static GtkWidget *gsb_assistant_reconcile_config_page_automatically_associate ( GtkWidget *assistant );
+static GtkWidget *gsb_assistant_reconcile_config_page_manually_associate ( GtkWidget *assistant );
+static GtkWidget *gsb_assistant_reconcile_config_page_menu ( GtkWidget *assistant );
+static gboolean gsb_assistant_reconcile_config_page_menu_toggled ( GtkWidget *button,
GtkWidget *assistant );
-static GtkWidget *gsb_assistant_reconcile_config_page_new_reconcile ( void );
-static GtkWidget *gsb_assistant_reconcile_config_page_success ( void );
+static GtkWidget *gsb_assistant_reconcile_config_page_new_reconcile ( void );
+static GtkWidget *gsb_assistant_reconcile_config_page_success ( void );
static gboolean gsb_assistant_reconcile_config_update_auto_asso ( GtkWidget *assistant,
gint new_page );
static gboolean gsb_assistant_reconcile_config_update_manu_asso ( GtkWidget *assistant,
Index: balance_estimate_data.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/balance_estimate_data.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- balance_estimate_data.c 20 Apr 2010 21:34:33 -0000 1.22
+++ balance_estimate_data.c 4 May 2010 12:27:52 -0000 1.23
@@ -58,6 +58,7 @@
static gboolean bet_data_update_div ( SH *sh, gint transaction_number, gint sub_div );
static void struct_free_bet_future ( struct_futur_data *scheduled );
static void struct_free_bet_range ( SBR *sbr );
+static void struct_free_bet_transfert ( struct_transfert_data *transfert );
static void struct_free_hist_div ( struct_hist_div *shd );
static SH *struct_initialise_bet_historical ( void );
/*END_STATIC*/
@@ -80,9 +81,12 @@
/** the hashtable which contains all the bet_future structures */
static GHashTable *bet_future_list;
-
static gint future_number;
+/** the hashtable for account_balance */
+static GHashTable *bet_transfert_list = NULL;
+static gint transfert_number;
+
/* force la mise à jour des données */
static gint bet_maj = FALSE;
@@ -106,6 +110,12 @@
(GDestroyNotify) struct_free_bet_future );
future_number = 0;
+ bet_transfert_list = g_hash_table_new_full ( g_str_hash,
+ g_str_equal,
+ (GDestroyNotify) g_free,
+ (GDestroyNotify) struct_free_bet_transfert );
+ transfert_number = 0;
+
return FALSE;
}
@@ -309,9 +319,6 @@
char *sub_key;
struct_hist_div *shd;
- //~ devel_debug ( g_strdup_printf ("account_nb = %d div_number = %d sub_div_nb = %d",
- //~ account_nb, div_number, sub_div_nb));
-
if ( account_nb == 0 )
key = g_strconcat ("0:", utils_str_itoa ( div_number ), NULL );
else
@@ -710,6 +717,7 @@
gchar *tmp_str = NULL;
GHashTableIter iter;
gpointer key, value;
+ gint index = 0;
if ( g_hash_table_size ( bet_hist_div_list ) == 0 )
return NULL;
@@ -805,6 +813,36 @@
g_free (limit_date);
}
+ g_hash_table_iter_init ( &iter, bet_transfert_list );
+ index = 0;
+ while ( g_hash_table_iter_next ( &iter, &key, &value ) )
+ {
+ struct_transfert_data *transfert = ( struct_transfert_data* ) value;
+ gchar *date;
+
+ /* set the dates */
+ date = gsb_format_gdate_safe ( transfert -> date );
+
+ tmp_str = g_markup_printf_escaped ( "\t<Bet_transfert Nb=\"%d\" Dt=\"%s\" Ac=\"%d\" "
+ "Ty=\"%d\" Ra=\"%d\" Rt=\"%d\" Aim=\"%d\" Ca=\"%d\" Sca=\"%d\" "
+ "Bu=\"%d\" Sbu=\"%d\" />\n",
+ ++index,
+ my_safe_null_str ( date ),
+ transfert -> account_number,
+ transfert -> type,
+ transfert -> replace_account,
+ transfert -> replace_transaction,
+ transfert -> auto_inc_month,
+ transfert -> category_number,
+ transfert -> sub_category_number,
+ transfert -> budgetary_number,
+ transfert -> sub_budgetary_number );
+
+ g_ptr_array_add ( tab, tmp_str );
+
+ g_free (date);
+ }
+
return tab;
}
@@ -1051,7 +1089,7 @@
/**
- * add lines creates in the tab_array
+ * add lines creates in the bet_future_list
*
*
*
@@ -1454,6 +1492,162 @@
}
+/**
+ *
+ *
+ *
+ *
+ * */
+struct_transfert_data *struct_initialise_bet_transfert ( void )
+{
+ struct_transfert_data *transfert;
+
+ transfert = g_malloc0 ( sizeof ( struct_transfert_data ) );
+
+ transfert -> date = NULL;
+
+ return transfert;
+}
+
+
+/**
+ *
+ *
+ *
+ *
+ * */
+void struct_free_bet_transfert ( struct_transfert_data *transfert )
+{
+ if ( transfert -> date )
+ g_date_free ( transfert -> date );
+
+ g_free ( transfert );
+}
+
+
+/**
+ *
+ *
+ *
+ *
+ * */
+GHashTable *bet_data_transfert_get_list ( void )
+{
+ return bet_transfert_list;
+}
+
+
+/**
+ * add line in the bet_transfer_list
+ *
+ *
+ *
+ * */
+gboolean bet_data_transfert_add_line ( struct_transfert_data *transfert )
+{
+ gchar *key;
+
+ transfert_number ++;
+
+ if ( transfert -> account_number == 0 )
+ key = g_strconcat ("0:", utils_str_itoa ( transfert_number ), NULL );
+ else
+ key = g_strconcat ( utils_str_itoa ( transfert -> account_number ), ":",
+ utils_str_itoa ( transfert_number ), NULL );
+
+ transfert -> number = transfert_number;
+ g_hash_table_insert ( bet_transfert_list, key, transfert );
+
+ if ( etat.modification_fichier == 0 )
+ modification_fichier ( TRUE );
+
+ return TRUE;
+}
+
+
+/**
+ *
+ *
+ *
+ *
+ * */
+gboolean bet_data_transfert_remove_line ( gint account_number, gint number )
+{
+ GHashTableIter iter;
+ gpointer key, value;
+
+ g_hash_table_iter_init ( &iter, bet_transfert_list );
+ while (g_hash_table_iter_next ( &iter, &key, &value ) )
+ {
+ struct_transfert_data *transfert = ( struct_transfert_data *) value;
+
+ if ( account_number != transfert -> account_number
+ ||
+ number != transfert -> number)
+ continue;
+
+ g_hash_table_iter_remove ( &iter );
+
+ break;
+ }
+
+ if ( etat.modification_fichier == 0 )
+ modification_fichier ( TRUE );
+
+ return FALSE;
+}
+
+
+/**
+ *
+ *
+ *
+ *
+ * */
+gboolean bet_data_transfert_set_line_from_file ( struct_transfert_data *transfert )
+{
+ gchar *key;
+
+ if ( transfert -> account_number == 0 )
+ key = g_strconcat ("0:", utils_str_itoa ( transfert -> number ), NULL );
+ else
+ key = g_strconcat ( utils_str_itoa ( transfert -> account_number ), ":",
+ utils_str_itoa ( transfert -> number ), NULL );
+
+ if ( transfert -> number > transfert_number )
+ transfert_number = transfert -> number;
+
+ g_hash_table_insert ( bet_transfert_list, key, transfert );
+
+ return TRUE;
+}
+
+
+/**
+ * modify transfert line
+ *
+ *
+ *
+ * */
+gboolean bet_data_transfert_modify_line ( struct_transfert_data *transfert )
+{
+ gchar *key;
+
+ if ( transfert -> account_number == 0 )
+ key = g_strconcat ("0:", utils_str_itoa ( transfert -> number ), NULL );
+ else
+ key = g_strconcat ( utils_str_itoa ( transfert -> account_number ), ":",
+ utils_str_itoa ( transfert -> number ), NULL );
+
+ g_hash_table_replace ( bet_transfert_list, key, transfert );
+
+ if ( etat.modification_fichier == 0 )
+ modification_fichier ( TRUE );
+
+ return TRUE;
+}
+
+
/* Local Variables: */
/* c-basic-offset: 4 */
/* End: */
Index: gsb_data_currency_link.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_currency_link.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- gsb_data_currency_link.c 18 Oct 2009 17:46:20 -0000 1.17
+++ gsb_data_currency_link.c 4 May 2010 12:27:53 -0000 1.18
@@ -59,7 +59,7 @@
} struct_currency_link;
/*START_STATIC*/
-static void _g_data_currency_link_free ( struct_currency_link *currency_link );
+static void _g_data_currency_link_free ( struct_currency_link *currency_link );
static gboolean gsb_data_currency_link_check_for_invalid ( gint currency_link_number );
static gpointer gsb_data_currency_link_get_structure ( gint currency_link_number );
static gint gsb_data_currency_link_max_number ( void );
Index: main.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/main.c,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -d -r1.175 -r1.176
--- main.c 28 Apr 2010 16:19:58 -0000 1.175
+++ main.c 4 May 2010 12:27:53 -0000 1.176
@@ -63,8 +63,8 @@
static gboolean gsb_grisbi_change_state_window ( GtkWidget *window,
GdkEventWindowState *event,
gpointer null );
-static gboolean main_window_delete_event (GtkWidget *window, gpointer data);
-static void main_window_destroy_event( GObject* obj, gpointer data);
+static gboolean main_window_delete_event (GtkWidget *window, gpointer data);
+static void main_window_destroy_event( GObject* obj, gpointer data);
/*END_STATIC*/
/* vbox ajoutée dans la fenetre de base, contient le menu et la fenetre d'utilisation */
Index: transaction_list_select.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/transaction_list_select.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- transaction_list_select.c 5 Apr 2010 21:24:53 -0000 1.10
+++ transaction_list_select.c 4 May 2010 12:27:53 -0000 1.11
@@ -40,7 +40,7 @@
/*END_INCLUDE*/
/*START_STATIC*/
-static gboolean transaction_list_select_record ( CustomRecord *record );
+static gboolean transaction_list_select_record ( CustomRecord *record );
/*END_STATIC*/
/*START_EXTERN*/
Index: gsb_autofunc.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_autofunc.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- gsb_autofunc.c 20 Apr 2010 21:34:33 -0000 1.27
+++ gsb_autofunc.c 4 May 2010 12:27:52 -0000 1.28
@@ -51,23 +51,23 @@
/*END_INCLUDE*/
/*START_STATIC*/
-static gboolean gsb_autofunc_checkbutton_changed ( GtkWidget *button,
+static gboolean gsb_autofunc_checkbutton_changed ( GtkWidget *button,
gboolean default_func (gint, gboolean));
-static gboolean gsb_autofunc_combobox_changed ( GtkWidget *combobox,
+static gboolean gsb_autofunc_combobox_changed ( GtkWidget *combobox,
gboolean default_func (gint, gint));
static gboolean gsb_autofunc_currency_changed ( GtkWidget *combobox,
gboolean default_func (gint, gint));
-static gboolean gsb_autofunc_date_changed ( GtkWidget *entry,
+static gboolean gsb_autofunc_date_changed ( GtkWidget *entry,
gboolean default_func (gint, const GDate *));
-static gboolean gsb_autofunc_entry_changed ( GtkWidget *entry,
+static gboolean gsb_autofunc_entry_changed ( GtkWidget *entry,
gboolean default_func (gint, const gchar *));
-static gboolean gsb_autofunc_int_changed ( GtkWidget *entry,
+static gboolean gsb_autofunc_int_changed ( GtkWidget *entry,
gboolean default_func (gint, gint));
-static gboolean gsb_autofunc_real_changed ( GtkWidget *entry,
+static gboolean gsb_autofunc_real_changed ( GtkWidget *entry,
gboolean default_func (gint, gsb_real));
-static gboolean gsb_autofunc_spin_changed ( GtkWidget *spin_button,
+static gboolean gsb_autofunc_spin_changed ( GtkWidget *spin_button,
gboolean default_func (gint, gint));
-static gboolean gsb_autofunc_textview_changed ( GtkTextBuffer *buffer,
+static gboolean gsb_autofunc_textview_changed ( GtkTextBuffer *buffer,
gboolean default_func (gint, const gchar *));
/*END_STATIC*/
Index: gsb_account.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_account.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- gsb_account.c 18 Apr 2010 18:45:03 -0000 1.49
+++ gsb_account.c 4 May 2010 12:27:52 -0000 1.50
@@ -35,6 +35,7 @@
#include "./gsb_file.h"
#include "./gsb_form_scheduler.h"
#include "./navigation.h"
+#include "./fenetre_principale.h"
#include "./menu.h"
#include "./gsb_real.h"
#include "./gsb_scheduler_list.h"
@@ -49,8 +50,6 @@
#include "./gsb_form_scheduler.h"
#include "./include.h"
#include "./structures.h"
-#include "./gsb_real.h"
-#include "./gsb_data_account.h"
/*END_INCLUDE*/
/*START_STATIC*/
Index: custom_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/custom_list.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- custom_list.c 9 Jan 2010 20:57:38 -0000 1.7
+++ custom_list.c 4 May 2010 12:27:52 -0000 1.8
@@ -42,39 +42,39 @@
/*END_INCLUDE*/
/*START_STATIC*/
-static void custom_list_class_init (CustomListClass *klass);
+static void custom_list_class_init (CustomListClass *klass);
static void custom_list_finalize (GObject *object);
-static GType custom_list_get_column_type (GtkTreeModel *tree_model,
+static GType custom_list_get_column_type (GtkTreeModel *tree_model,
gint index);
-static GtkTreeModelFlags custom_list_get_flags (GtkTreeModel *tree_model);
-static gboolean custom_list_get_iter (GtkTreeModel *tree_model,
+static GtkTreeModelFlags custom_list_get_flags (GtkTreeModel *tree_model);
+static gboolean custom_list_get_iter (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkTreePath *path);
-static gint custom_list_get_n_columns (GtkTreeModel *tree_model);
-static GtkTreePath *custom_list_get_path (GtkTreeModel *tree_model,
+static gint custom_list_get_n_columns (GtkTreeModel *tree_model);
+static GtkTreePath *custom_list_get_path (GtkTreeModel *tree_model,
GtkTreeIter *iter);
-static void custom_list_get_value (GtkTreeModel *tree_model,
+static void custom_list_get_value (GtkTreeModel *tree_model,
GtkTreeIter *iter,
gint column,
GValue *value);
-static void custom_list_init (CustomList *custom_list);
-static gboolean custom_list_iter_children (GtkTreeModel *tree_model,
+static void custom_list_init (CustomList *custom_list);
+static gboolean custom_list_iter_children (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkTreeIter *parent);
-static gboolean custom_list_iter_has_child (GtkTreeModel *tree_model,
+static gboolean custom_list_iter_has_child (GtkTreeModel *tree_model,
GtkTreeIter *iter);
-static gint custom_list_iter_n_children (GtkTreeModel *tree_model,
+static gint custom_list_iter_n_children (GtkTreeModel *tree_model,
GtkTreeIter *iter);
-static gboolean custom_list_iter_next (GtkTreeModel *tree_model,
+static gboolean custom_list_iter_next (GtkTreeModel *tree_model,
GtkTreeIter *iter);
-static gboolean custom_list_iter_nth_child (GtkTreeModel *tree_model,
+static gboolean custom_list_iter_nth_child (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkTreeIter *parent,
gint n);
-static gboolean custom_list_iter_parent (GtkTreeModel *tree_model,
+static gboolean custom_list_iter_parent (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkTreeIter *child);
-static void custom_list_tree_model_init (GtkTreeModelIface *iface);
+static void custom_list_tree_model_init (GtkTreeModelIface *iface);
/*END_STATIC*/
/*START_EXTERN*/
Index: gtk_combofix.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gtk_combofix.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- gtk_combofix.c 5 Apr 2010 21:24:53 -0000 1.75
+++ gtk_combofix.c 4 May 2010 12:27:53 -0000 1.76
@@ -1575,6 +1575,8 @@
if ( tmp_str
&&
+ tmp_item
+ &&
g_utf8_collate ( g_utf8_casefold ( tmp_str, -1 ),
g_utf8_casefold ( tmp_item, -1 ) ) == 0 )
break;
@@ -1820,6 +1822,11 @@
gchar *cmp_string_1;
gchar *cmp_string_2;
+ if ( string_1 == NULL )
+ return -1;
+ if ( string_2 == NULL )
+ return 1;
+
cmp_string_1 = g_utf8_collate_key (string_1, -1);
cmp_string_2 = g_utf8_collate_key (string_2, -1);
return_value = g_ascii_strcasecmp ( cmp_string_1,
Index: gsb_reconcile.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_reconcile.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gsb_reconcile.h 18 Feb 2007 12:37:19 -0000 1.2
+++ gsb_reconcile.h 4 May 2010 12:27:53 -0000 1.3
@@ -8,8 +8,8 @@
/* START_DECLARATION */
GtkWidget *gsb_reconcile_create_box ( void );
gboolean gsb_reconcile_run_reconciliation ( GtkWidget *button,
- gpointer null );
+ gpointer null );
gboolean gsb_reconcile_update_amounts ( GtkWidget *entry,
- gpointer null );
+ gpointer null );
/* END_DECLARATION */
#endif
Index: gsb_file.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- gsb_file.c 5 Apr 2010 21:24:53 -0000 1.64
+++ gsb_file.c 4 May 2010 12:27:53 -0000 1.65
@@ -70,8 +70,8 @@
/*START_STATIC*/
static void gsb_file_append_name_to_opened_list ( gchar * path_fichier );
static gboolean gsb_file_automatic_backup ( gpointer null );
-static gchar *gsb_file_dialog_ask_name ( void );
-static gint gsb_file_dialog_save ( void );
+static gchar *gsb_file_dialog_ask_name ( void );
+static gint gsb_file_dialog_save ( void );
static gboolean gsb_file_save_backup ( void );
static gboolean gsb_file_save_file ( gint origine );
static void gsb_file_save_remove_old_file ( gchar *filename );
Index: utils.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- utils.h 5 Apr 2010 21:24:53 -0000 1.29
+++ utils.h 4 May 2010 12:27:53 -0000 1.30
@@ -25,6 +25,5 @@
gboolean sensitive_widget ( gpointer object,
GtkWidget *widget );
void update_ecran ( void );
-GtkWidget *utils_get_child_widget_by_name ( GtkWidget *ancestor, const gchar *name );
/* END_DECLARATION */
#endif
Index: parametres.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/parametres.c,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -d -r1.214 -r1.215
--- parametres.c 5 Apr 2010 21:24:53 -0000 1.214
+++ parametres.c 4 May 2010 12:27:53 -0000 1.215
@@ -64,7 +64,7 @@
/*START_STATIC*/
static GtkWidget * create_preferences_tree ( );
-static GtkWidget *gsb_config_scheduler_page ( void );
+static GtkWidget *gsb_config_scheduler_page ( void );
static gboolean gsb_config_scheduler_switch_balances_with_scheduled ( void );
static gboolean gsb_gui_delete_msg_toggled ( GtkCellRendererToggle *cell, gchar *path_str,
GtkTreeModel * model );
Index: fenetre_principale.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/fenetre_principale.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- fenetre_principale.c 18 Apr 2010 14:48:46 -0000 1.135
+++ fenetre_principale.c 4 May 2010 12:27:52 -0000 1.136
@@ -28,11 +28,11 @@
#include "./balance_estimate_tab.h"
#include "./balance_estimate_data.h"
#include "./balance_estimate_hist.h"
-#include "./gsb_account_property.h"
#include "./navigation.h"
#include "./gsb_transactions_list.h"
#include "./accueil.h"
#include "./etats_onglet.h"
+#include "./gsb_account_property.h"
#include "./gsb_form.h"
#include "./gsb_scheduler_list.h"
#include "./main.h"
Index: print_report.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/print_report.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- print_report.c 14 Feb 2010 17:48:50 -0000 1.11
+++ print_report.c 4 May 2010 12:27:53 -0000 1.12
@@ -49,15 +49,15 @@
static gboolean print_report_begin ( GtkPrintOperation *operation,
GtkPrintContext *context,
gpointer null );
-static void print_report_draw_column ( GtkTableChild *child,
+static void print_report_draw_column ( GtkTableChild *child,
gint line_position );
-static void print_report_draw_line ( GtkTableChild *child,
+static void print_report_draw_line ( GtkTableChild *child,
gint line_position );
static gboolean print_report_draw_page ( GtkPrintOperation *operation,
GtkPrintContext *context,
gint page,
gpointer null );
-static void print_report_draw_row ( GtkPrintContext *context,
+static void print_report_draw_row ( GtkPrintContext *context,
GtkTableChild *child,
gint line_position,
gint is_title );
Index: gsb_data_partial_balance.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_partial_balance.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gsb_data_partial_balance.c 5 Apr 2010 21:24:53 -0000 1.12
+++ gsb_data_partial_balance.c 4 May 2010 12:27:53 -0000 1.13
@@ -61,7 +61,7 @@
/*START_STATIC*/
-static void _gsb_data_partial_balance_free ( struct_partial_balance *partial_balance);
+static void _gsb_data_partial_balance_free ( struct_partial_balance *partial_balance);
static gpointer gsb_data_partial_balance_get_structure ( gint partial_balance_number );
static gboolean gsb_data_partial_balance_init_from_liste_cptes ( gint partial_balance_number,
GtkWidget *parent );
@@ -81,6 +81,7 @@
/*END_STATIC*/
/*START_EXTERN*/
+extern GtkWidget *main_vbox;
extern gsb_real null_real;
extern GtkWidget *window;
/*END_EXTERN*/
@@ -1039,11 +1040,11 @@
partial_balance = gsb_data_partial_balance_get_structure ( partial_balance_number );
if ( !partial_balance )
- return 0;
+ return NULL;
if ( partial_balance -> liste_cptes == NULL ||
strlen ( partial_balance -> liste_cptes ) == 0 )
- return 0;
+ return NULL;
tab = g_strsplit ( partial_balance -> liste_cptes, ";", 0 );
for ( i = 0; tab[i]; i++ )
@@ -1078,9 +1079,10 @@
if ( partial_balance -> colorise && solde.mantissa < 0 )
string = g_strdup_printf ( "<span color=\"red\">%s</span>",
gsb_real_get_string_with_currency (
- solde, partial_balance -> currency, TRUE) );
+ solde, partial_balance -> currency, TRUE ) );
else
- string = gsb_real_get_string_with_currency (solde, partial_balance -> currency, TRUE);
+ string = gsb_real_get_string_with_currency (
+ solde, partial_balance -> currency, TRUE );
return string;
}
@@ -1090,22 +1092,21 @@
*
*
* */
-gchar *gsb_data_partial_balance_get_current_balance ( gint partial_balance_number )
+gsb_real gsb_data_partial_balance_get_current_amount ( gint partial_balance_number )
{
struct_partial_balance *partial_balance;
gsb_real solde = null_real;
gchar **tab;
- gchar *string;
gint i;
partial_balance = gsb_data_partial_balance_get_structure ( partial_balance_number );
if ( !partial_balance )
- return 0;
+ return null_real;
if ( partial_balance -> liste_cptes == NULL ||
strlen ( partial_balance -> liste_cptes ) == 0 )
- return 0;
+ return null_real;
tab = g_strsplit ( partial_balance -> liste_cptes, ";", 0 );
for ( i = 0; tab[i]; i++ )
@@ -1136,12 +1137,34 @@
solde = gsb_real_add ( solde, tmp_real );
}
+ return solde;
+}
+
+
+/**
+ *
+ *
+ * */
+gchar *gsb_data_partial_balance_get_current_balance ( gint partial_balance_number )
+{
+ struct_partial_balance *partial_balance;
+ gsb_real solde = null_real;
+ gchar *string;
+
+ partial_balance = gsb_data_partial_balance_get_structure ( partial_balance_number );
+
+ if ( !partial_balance )
+ return NULL;
+
+ solde = gsb_data_partial_balance_get_current_amount ( partial_balance_number );
+
if ( partial_balance -> colorise && solde.mantissa < 0 )
string = g_strdup_printf ( "<span color=\"red\">%s</span>",
gsb_real_get_string_with_currency (
- solde, partial_balance -> currency, TRUE) );
+ solde, partial_balance -> currency, TRUE ) );
else
- string = gsb_real_get_string_with_currency (solde, partial_balance -> currency, TRUE);
+ string = gsb_real_get_string_with_currency (
+ solde, partial_balance -> currency, TRUE );
return string;
}
Index: gsb_data_partial_balance.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_partial_balance.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gsb_data_partial_balance.h 16 Aug 2009 21:00:05 -0000 1.3
+++ gsb_data_partial_balance.h 4 May 2010 12:27:53 -0000 1.4
@@ -3,6 +3,7 @@
/* START_INCLUDE_H */
+#include "././gsb_real.h"
#include "././gsb_data_account.h"
/* END_INCLUDE_H */
@@ -15,6 +16,7 @@
GtkSelectionData * selection_data );
gboolean gsb_data_partial_balance_get_colorise ( gint partial_balance_number );
gint gsb_data_partial_balance_get_currency ( gint partial_balance_number );
+gsb_real gsb_data_partial_balance_get_current_amount ( gint partial_balance_number );
gchar *gsb_data_partial_balance_get_current_balance ( gint partial_balance_number );
kind_account gsb_data_partial_balance_get_kind ( gint partial_balance_number );
GSList *gsb_data_partial_balance_get_list ( void );
Index: utils.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- utils.c 5 Apr 2010 21:24:53 -0000 1.64
+++ utils.c 4 May 2010 12:27:53 -0000 1.65
@@ -484,50 +484,6 @@
return version;
}
-/**
- * This function returns a child widget whose name is passed as parameter
- *
- * /parameter ancestor
- * /parameter name of the child
- *
- * /return the child or NULL
- */
-GtkWidget *utils_get_child_widget_by_name ( GtkWidget *ancestor, const gchar *name )
-{
- GtkWidget *widget;
- GList *list;
-
- list = gtk_container_get_children ( GTK_CONTAINER ( ancestor ) );
- if ( list == NULL )
- return NULL;
-
- do
- {
- const gchar *tmp_str;
-
- widget = list -> data;
-
- tmp_str = gtk_widget_get_name ( GTK_WIDGET ( widget ) );
- if ( tmp_str && g_strcmp0 ( name, tmp_str ) == 0 )
- return widget;
-
- if ( GTK_IS_CONTAINER ( widget ) == TRUE )
- {
- widget = utils_get_child_widget_by_name ( widget, name );
- if ( widget )
- {
- tmp_str = gtk_widget_get_name ( GTK_WIDGET ( widget ) );
- if ( tmp_str && g_strcmp0 ( name, tmp_str ) == 0 )
- return widget;
- }
- }
-
- list = g_list_next ( list );
- } while ( list );
-
- return NULL;
-}
-
/* Local Variables: */
/* c-basic-offset: 4 */
/* End: */
Index: gsb_data_payment.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_payment.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- gsb_data_payment.c 18 Apr 2010 14:38:28 -0000 1.21
+++ gsb_data_payment.c 4 May 2010 12:27:53 -0000 1.22
@@ -63,7 +63,7 @@
static struct_payment *payment_buffer;
/*START_STATIC*/
-static void _gsb_data_payment_free ( struct_payment *payment );
+static void _gsb_data_payment_free ( struct_payment *payment );
static struct_payment *gsb_data_payment_get_structure ( gint payment_number );
static gint gsb_data_payment_max_number ( void );
/*END_STATIC*/
Index: transaction_model.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/transaction_model.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- transaction_model.c 13 Feb 2010 17:44:59 -0000 1.7
+++ transaction_model.c 4 May 2010 12:27:53 -0000 1.8
@@ -134,52 +134,6 @@
/**
- * return the path of the transaction
- * according line_in_transaction
- *
- * \param line_in_transaction
- *
- * \return a newly allocated GtkTreePath
- * */
-GtkTreePath *transaction_model_get_path ( gint transaction_number,
- gint line_in_transaction )
-{
- CustomRecord *record;
- GtkTreePath *path;
- GtkTreeIter iter;
-
- g_return_val_if_fail ( custom_list != NULL, NULL );
-
- if (!transaction_model_get_transaction_iter ( &iter,
- transaction_number, line_in_transaction ))
- {
- printf ("iter == NULL\n");
- return NULL;
- }
-
- record = iter.user_data;
- if (!record)
- {
- printf ("record == NULL\n");
- return NULL;
- }
- record = record -> transaction_records[line_in_transaction];
-
- path = gtk_tree_path_new ();
- if (record -> mother_row)
- {
- printf ("record -> mother_row -> filtered_pos = %d\n", record -> mother_row -> filtered_pos);
- /* it's a child, need to get the path of the mother */
- gtk_tree_path_append_index (path, record -> mother_row -> filtered_pos);
- }
-
- gtk_tree_path_append_index (path, record -> filtered_pos);
-
- return path;
-}
-
-
-/**
* find the iter of the line of the asked transaction
* the transaction can be a mother or a child
*
Index: file_obfuscate_qif.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/file_obfuscate_qif.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- file_obfuscate_qif.c 1 Jan 2009 20:43:49 -0000 1.5
+++ file_obfuscate_qif.c 4 May 2010 12:27:52 -0000 1.6
@@ -42,7 +42,7 @@
static void file_obfuscate_qif_next_line ( gchar *file_content,
gint *position,
gint *position_in_line );
-static void file_obfuscate_qif_start ( gchar *filename );
+static void file_obfuscate_qif_start ( gchar *filename );
/*END_STATIC*/
/*START_EXTERN*/
Index: gsb_transactions_list_sort.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_transactions_list_sort.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- gsb_transactions_list_sort.c 5 Apr 2010 21:24:53 -0000 1.23
+++ gsb_transactions_list_sort.c 4 May 2010 12:27:53 -0000 1.24
@@ -538,36 +538,42 @@
gint transaction_number_2 )
{
gint return_value;
+ gint party_number_1;
+ gint party_number_2;
- if ( gsb_data_transaction_get_party_number ( transaction_number_1)== gsb_data_transaction_get_party_number ( transaction_number_2))
- return_value = gsb_transactions_list_sort_by_transaction_date_and_no(transaction_number_1, transaction_number_2);
+ party_number_1 = gsb_data_transaction_get_party_number ( transaction_number_1 );
+ party_number_2 = gsb_data_transaction_get_party_number ( transaction_number_2 );
+
+ if ( party_number_1 == party_number_2 )
+ return_value = gsb_transactions_list_sort_by_transaction_date_and_no (
+ transaction_number_1, transaction_number_2 );
else
{
- const gchar *temp_1;
- const gchar *temp_2;
+ const gchar *temp_1;
+ const gchar *temp_2;
- temp_1 = gsb_data_payee_get_name ( gsb_data_transaction_get_party_number ( transaction_number_1),
- TRUE );
- temp_2 = gsb_data_payee_get_name ( gsb_data_transaction_get_party_number ( transaction_number_2),
- TRUE );
+ temp_1 = gsb_data_payee_get_name ( party_number_1, TRUE );
+ if ( temp_1 == NULL )
+ return -1;
- /* g_utf8_collate is said not very fast, must try with big big account to check
- * if it's enough, for me it's ok (cedric), eventually, change with gsb_strcasecmp */
- return_value = g_utf8_collate ( g_utf8_casefold ( temp_1 ? temp_1 : "",
- -1 ),
- g_utf8_casefold ( temp_2 ? temp_2 : "",
- -1 ));
+ temp_2 = gsb_data_payee_get_name ( party_number_2, TRUE );
+ if ( temp_2 == NULL )
+ return 1;
+
+ /* g_utf8_collate is said not very fast, must try with big big account to check
+ * if it's enough, for me it's ok (cedric), eventually, change with gsb_strcasecmp */
+ return_value = g_utf8_collate ( g_utf8_casefold ( temp_1 ? temp_1 : "", -1 ),
+ g_utf8_casefold ( temp_2 ? temp_2 : "", -1 ));
}
if ( return_value )
- return return_value;
+ return return_value;
else
- return gsb_transactions_list_sort_by_transaction_date_and_no (transaction_number_1, transaction_number_2);
+ return gsb_transactions_list_sort_by_transaction_date_and_no (
+ transaction_number_1, transaction_number_2);
}
-
-
/** used to compare 2 iters and sort the by budgetary first, and
* by date and no transaction after
* always put the white line below
@@ -580,40 +586,52 @@
gint transaction_number_2 )
{
gint return_value;
+ gint budgetary_number_1;
+ gint budgetary_number_2;
+ gint sub_budgetary_number_1;
+ gint sub_budgetary_number_2;
- if ( gsb_data_transaction_get_budgetary_number ( transaction_number_1) == gsb_data_transaction_get_budgetary_number ( transaction_number_2)
+ budgetary_number_1 = gsb_data_transaction_get_budgetary_number ( transaction_number_1 );
+ budgetary_number_2 = gsb_data_transaction_get_budgetary_number ( transaction_number_2 );
+ sub_budgetary_number_1 = gsb_data_transaction_get_sub_budgetary_number ( transaction_number_1 );
+ sub_budgetary_number_2 = gsb_data_transaction_get_sub_budgetary_number ( transaction_number_2 );
+
+ if ( budgetary_number_1 == budgetary_number_2
&&
- gsb_data_transaction_get_sub_budgetary_number ( transaction_number_1)== gsb_data_transaction_get_sub_budgetary_number ( transaction_number_2))
- return_value = gsb_transactions_list_sort_by_transaction_date_and_no(transaction_number_1, transaction_number_2);
+ sub_budgetary_number_1 == sub_budgetary_number_2 )
+ return_value = gsb_transactions_list_sort_by_transaction_date_and_no(
+ transaction_number_1, transaction_number_2 );
else
{
- const gchar *temp_1;
- const gchar *temp_2;
+ const gchar *temp_1;
+ const gchar *temp_2;
- temp_1 = gsb_data_budget_get_name ( gsb_data_transaction_get_budgetary_number ( transaction_number_1),
- gsb_data_transaction_get_sub_budgetary_number ( transaction_number_1),
- NULL );
- temp_2 = gsb_data_budget_get_name ( gsb_data_transaction_get_budgetary_number ( transaction_number_2),
- gsb_data_transaction_get_sub_budgetary_number ( transaction_number_2),
- NULL);
+ temp_1 = gsb_data_budget_get_name ( budgetary_number_1,
+ sub_budgetary_number_1,
+ NULL );
+ if ( temp_1 == NULL )
+ return -1;
- /* g_utf8_collate is said not very fast, must try with big big account to check
- * if it's enough, for me it's ok (cedric), eventually, change with gsb_strcasecmp */
- return_value = g_utf8_collate ( g_utf8_casefold ( temp_1 ? temp_1 : "",
- -1 ),
- g_utf8_casefold ( temp_2 ? temp_2 : "",
- -1 ));
+ temp_2 = gsb_data_budget_get_name ( budgetary_number_2,
+ sub_budgetary_number_2,
+ NULL);
+ if ( temp_2 == NULL )
+ return 1;
+
+ /* g_utf8_collate is said not very fast, must try with big big account to check
+ * if it's enough, for me it's ok (cedric), eventually, change with gsb_strcasecmp */
+ return_value = g_utf8_collate ( g_utf8_casefold ( temp_1 ? temp_1 : "", -1 ),
+ g_utf8_casefold ( temp_2 ? temp_2 : "", -1 ) );
}
if ( return_value )
- return return_value;
+ return return_value;
else
- return gsb_transactions_list_sort_by_transaction_date_and_no(transaction_number_1, transaction_number_2);
+ return gsb_transactions_list_sort_by_transaction_date_and_no (
+ transaction_number_1, transaction_number_2);
}
-
-
/**
* used to compare 2 iters and sort the by credit amount first, and
* by date and no transaction after
@@ -707,7 +725,7 @@
/* if it's the same type, we sort by the content of the types */
- if ( gsb_data_transaction_get_method_of_payment_number ( transaction_number_1)== gsb_data_transaction_get_method_of_payment_number ( transaction_number_2))
+ if ( gsb_data_transaction_get_method_of_payment_number ( transaction_number_1) == gsb_data_transaction_get_method_of_payment_number ( transaction_number_2))
{
return_value = g_utf8_collate ( g_utf8_casefold ( gsb_data_transaction_get_method_of_payment_content ( transaction_number_1) ? gsb_data_transaction_get_method_of_payment_content ( transaction_number_1) : "",
-1 ),
Index: utils_font.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils_font.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- utils_font.c 27 Oct 2008 14:34:36 -0000 1.4
+++ utils_font.c 4 May 2010 12:27:53 -0000 1.5
@@ -34,9 +34,9 @@
/*END_INCLUDE*/
/*START_STATIC*/
-static gboolean utils_font_choose ( GtkWidget *button,
+static gboolean utils_font_choose ( GtkWidget *button,
gchar **fontname );
-static void utils_font_update_labels ( GtkWidget *button,
+static void utils_font_update_labels ( GtkWidget *button,
const gchar *fontname);
/*END_STATIC*/
Index: gsb_transactions_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_transactions_list.c,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -d -r1.210 -r1.211
--- gsb_transactions_list.c 25 Apr 2010 05:48:16 -0000 1.210
+++ gsb_transactions_list.c 4 May 2010 12:27:53 -0000 1.211
@@ -59,6 +59,7 @@
#include "./transaction_list_select.h"
#include "./transaction_list_sort.h"
#include "./transaction_model.h"
+#include "./balance_estimate_data.h"
#include "./structures.h"
#include "./custom_list.h"
#include "./fenetre_principale.h"
@@ -84,7 +85,7 @@
static gboolean gsb_transactions_list_check_mark ( gint transaction_number );
static gint gsb_transactions_list_choose_reconcile ( gint account_number,
gint selected_reconcile_number );
-static gboolean gsb_transactions_list_clone_template ( GtkWidget *menu_item,
+static gboolean gsb_transactions_list_clone_template ( GtkWidget *menu_item,
gpointer null );
static gint gsb_transactions_list_clone_transaction ( gint transaction_number,
gint mother_transaction_number );
Index: go-optionmenu.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/go-optionmenu.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- go-optionmenu.c 27 Apr 2009 19:41:03 -0000 1.11
+++ go-optionmenu.c 4 May 2010 12:27:52 -0000 1.12
@@ -38,61 +38,61 @@
/*END_INCLUDE*/
/*START_STATIC*/
-static void connect_menu_signals (GtkMenu *menu, gpointer data);;
-static void connect_menu_signals_to_submenu (GtkMenuItem *item, gpointer data);
-static gint go_option_menu_button_press (GtkWidget *widget,
+static void connect_menu_signals (GtkMenu *menu, gpointer data);;
+static void connect_menu_signals_to_submenu (GtkMenuItem *item, gpointer data);
+static gint go_option_menu_button_press (GtkWidget *widget,
GdkEventButton *event);
-static void go_option_menu_calc_size (GOOptionMenu *option_menu);
-static void go_option_menu_changed (GOOptionMenu *option_menu);
-static GType go_option_menu_child_type (GtkContainer *container);
-static void go_option_menu_class_init (GOOptionMenuClass *class);
-static void go_option_menu_destroy (GtkObject *object);
-static void go_option_menu_detacher (GtkWidget *widget,
+static void go_option_menu_calc_size (GOOptionMenu *option_menu);
+static void go_option_menu_changed (GOOptionMenu *option_menu);
+static GType go_option_menu_child_type (GtkContainer *container);
+static void go_option_menu_class_init (GOOptionMenuClass *class);
+static void go_option_menu_destroy (GtkObject *object);
+static void go_option_menu_detacher (GtkWidget *widget,
GtkMenu *menu) ;
-static gint go_option_menu_expose (GtkWidget *widget,
+static gint go_option_menu_expose (GtkWidget *widget,
GdkEventExpose *event);
-static void go_option_menu_get_property (GObject *object,
+static void go_option_menu_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec);
-static void go_option_menu_get_props (GOOptionMenu *option_menu,
+static void go_option_menu_get_props (GOOptionMenu *option_menu,
GOOptionMenuProps *props);
-static void go_option_menu_hide_all (GtkWidget *widget);
-static void go_option_menu_init (GOOptionMenu *option_menu);
-static void go_option_menu_item_destroy_cb (GtkWidget *widget,
+static void go_option_menu_hide_all (GtkWidget *widget);
+static void go_option_menu_init (GOOptionMenu *option_menu);
+static void go_option_menu_item_destroy_cb (GtkWidget *widget,
GOOptionMenu *option_menu);
-static void go_option_menu_item_state_changed_cb (GtkWidget *widget,
+static void go_option_menu_item_state_changed_cb (GtkWidget *widget,
GtkStateType previous_state,
GOOptionMenu *option_menu);
-static gint go_option_menu_key_press (GtkWidget *widget,
+static gint go_option_menu_key_press (GtkWidget *widget,
GdkEventKey *event);
-static gboolean go_option_menu_mnemonic_activate (GtkWidget *widget,
+static gboolean go_option_menu_mnemonic_activate (GtkWidget *widget,
gboolean group_cycling);
-static void go_option_menu_paint (GtkWidget *widget,
+static void go_option_menu_paint (GtkWidget *widget,
GdkRectangle *area);
-static void go_option_menu_position (GtkMenu *menu,
+static void go_option_menu_position (GtkMenu *menu,
gint *x,
gint *y,
gboolean *push_in,
gpointer user_data);
-static void go_option_menu_remove_contents (GOOptionMenu *option_menu);;
+static void go_option_menu_remove_contents (GOOptionMenu *option_menu);;
static void go_option_menu_remove_menu (GOOptionMenu *option_menu);
-static gint go_option_menu_scroll_event (GtkWidget *widget,
+static gint go_option_menu_scroll_event (GtkWidget *widget,
GdkEventScroll *event);
-static void go_option_menu_select_first_sensitive (GOOptionMenu *option_menu);
-static void go_option_menu_selection_done (GtkMenu *menu,
+static void go_option_menu_select_first_sensitive (GOOptionMenu *option_menu);
+static void go_option_menu_selection_done (GtkMenu *menu,
GOOptionMenu *option_menu);
-static void go_option_menu_set_property (GObject *object,
+static void go_option_menu_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec);
-static void go_option_menu_show_all (GtkWidget *widget);
-static void go_option_menu_size_allocate (GtkWidget *widget,
+static void go_option_menu_show_all (GtkWidget *widget);
+static void go_option_menu_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
-static void go_option_menu_size_request (GtkWidget *widget,
+static void go_option_menu_size_request (GtkWidget *widget,
GtkRequisition *requisition);
-static void go_option_menu_update_contents (GOOptionMenu *option_menu, GtkMenu *menu);;
-static void go_option_menu_update_contents_real (GOOptionMenu *option_menu,
+static void go_option_menu_update_contents (GOOptionMenu *option_menu, GtkMenu *menu);;
+static void go_option_menu_update_contents_real (GOOptionMenu *option_menu,
GtkMenu *menu, GtkMenuItem *menu_item);
/*END_STATIC*/
Index: gsb_data_scheduled.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_scheduled.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- gsb_data_scheduled.c 5 Apr 2010 21:24:53 -0000 1.34
+++ gsb_data_scheduled.c 4 May 2010 12:27:53 -0000 1.35
@@ -35,6 +35,7 @@
#include "./utils_dates.h"
#include "./utils_str.h"
#include "./include.h"
+#include "./gsb_real.h"
/*END_INCLUDE*/
@@ -82,7 +83,7 @@
/*START_STATIC*/
-static void _gsb_data_scheduled_free ( struct_scheduled *scheduled );
+static void _gsb_data_scheduled_free ( struct_scheduled *scheduled );
static void gsb_data_scheduled_delete_all_scheduled ();
static gint gsb_data_scheduled_get_last_number (void);
static gint gsb_data_scheduled_get_last_white_number (void);
Index: gsb_bank.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_bank.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- gsb_bank.c 10 Jan 2010 20:11:37 -0000 1.26
+++ gsb_bank.c 4 May 2010 12:27:53 -0000 1.27
@@ -46,31 +46,31 @@
/*END_INCLUDE*/
/*START_STATIC*/
-static gboolean gsb_bank_add ( GtkWidget *button,
+static gboolean gsb_bank_add ( GtkWidget *button,
gpointer null );
-static void gsb_bank_bic_code_changed ( GtkEntry *entry, gpointer data );
-static void gsb_bank_code_changed ( GtkEntry *entry, gpointer data );
-static gboolean gsb_bank_combobox_changed ( GtkWidget *combobox,
+static void gsb_bank_bic_code_changed ( GtkEntry *entry, gpointer data );
+static void gsb_bank_code_changed ( GtkEntry *entry, gpointer data );
+static gboolean gsb_bank_combobox_changed ( GtkWidget *combobox,
gboolean default_func (gint, gint));
-static gboolean gsb_bank_create_combobox_model ( void );
-static GtkWidget *gsb_bank_create_form ( GtkWidget *parent,
+static gboolean gsb_bank_create_combobox_model ( void );
+static GtkWidget *gsb_bank_create_form ( GtkWidget *parent,
GtkWidget *combobox );
-static gboolean gsb_bank_delete ( GtkWidget *button,
+static gboolean gsb_bank_delete ( GtkWidget *button,
gpointer null );
-static gboolean gsb_bank_edit_bank ( gint bank_number,
+static gboolean gsb_bank_edit_bank ( gint bank_number,
GtkWidget *combobox );
-static gboolean gsb_bank_list_change_selection ( GtkTreeSelection *selection,
+static gboolean gsb_bank_list_change_selection ( GtkTreeSelection *selection,
GtkWidget *container );
-static gboolean gsb_bank_list_changed ( GtkWidget *combobox,
+static gboolean gsb_bank_list_changed ( GtkWidget *combobox,
gpointer null );
-static gboolean gsb_bank_list_check_separator ( GtkTreeModel *model,
+static gboolean gsb_bank_list_check_separator ( GtkTreeModel *model,
GtkTreeIter *iter,
gpointer null );
-static gboolean gsb_bank_update_form ( gint bank_number,
+static gboolean gsb_bank_update_form ( gint bank_number,
GtkWidget *frame );
-static gboolean gsb_bank_update_selected_line ( GtkEntry *entry,
+static gboolean gsb_bank_update_selected_line ( GtkEntry *entry,
GtkWidget *combobox );
-static gboolean gsb_bank_update_selected_line_model ( GtkWidget *combobox );
+static gboolean gsb_bank_update_selected_line_model ( GtkWidget *combobox );
/*END_STATIC*/
static GtkWidget *bank_list_tree_view;
Index: gsb_data_report.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_report.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- gsb_data_report.c 24 Aug 2009 13:40:57 -0000 1.34
+++ gsb_data_report.c 4 May 2010 12:27:53 -0000 1.35
@@ -156,7 +156,7 @@
/*START_STATIC*/
-static void _gsb_data_report_free ( struct_report *report );
+static void _gsb_data_report_free ( struct_report *report );
static GSList *gsb_data_report_copy_categ_budget_struct (GSList *orig_categ_budget_list);
static struct_report *gsb_data_report_get_structure ( gint report_number );
/*END_STATIC*/
Index: gsb_file_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_config.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- gsb_file_config.c 5 Apr 2010 21:24:53 -0000 1.96
+++ gsb_file_config.c 4 May 2010 12:27:53 -0000 1.97
@@ -55,7 +55,7 @@
gpointer user_data,
GError **error);
static gboolean gsb_file_config_load_last_xml_config ( gchar *filename );
-static void gsb_file_config_remove_old_config_file ( gchar *filename );
+static void gsb_file_config_remove_old_config_file ( gchar *filename );
/*END_STATIC*/
- Previous message: [grisbi-cvs] grisbi/po cs.po, 1.112, 1.113 da.po, 1.116, 1.117 de.po, 1.191, 1.192 el.po, 1.80, 1.81 eo.po, 1.73, 1.74 es.po, 1.192, 1.193 fa.po, 1.103, 1.104 fr.po, 1.249, 1.250 grisbi.pot, 1.151, 1.152 he.po, 1.109, 1.110 it.po, 1.109, 1.110 nl.po, 1.108, 1.109 pl.po, 1.114, 1.115 pt_BR.po, 1.111, 1.112 ro.po, 1.110, 1.111 ru.po, 1.108, 1.109 zh_CN.po, 1.104, 1.105
- Next message: [grisbi-cvs] grisbi/src balance_estimate_data.c,1.23,1.24
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cvs
mailing list