[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9_5-85-g14d7dc3

[Pierre Biava]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grisbi".

The branch, master has been updated
       via  14d7dc384698309f7442d722ea82ac3e77c3f273 (commit)
      from  a66ad56e49aecf35b666db2a7146f6bac774583a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 14d7dc384698309f7442d722ea82ac3e77c3f273
Author: pbiava <pierre.biava at nerim.net>
Date:   Tue Apr 24 21:00:10 2012 +0200

    Fixed bug of replacement of a planned transaction

-----------------------------------------------------------------------

Changes:
diff --git a/src/bet_tab.c b/src/bet_tab.c
index 9dbfafe..391abcf 100644
--- a/src/bet_tab.c
+++ b/src/bet_tab.c
@@ -171,6 +171,35 @@ static gint bet_array_current_tree_view_width = 0;
 static GtkWidget *bet_array_toolbar;
 
 
+/**
+ * remplace l'opération planifiée de même date et de même catégorie ou IB
+ *
+ * \param modèle du tableau
+ *
+ * \return
+ * */
+static void bet_array_list_replace_scheduled_by_transfert ( GtkTreeModel *tab_model,
+                        gint account_number )
+{
+    GHashTable *transfert_list;
+    GHashTableIter iter;
+    gpointer key, value;
+
+    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;
+
+        if ( account_number != transfert -> account_number )
+            continue;
+
+        if (  transfert -> replace_transaction )
+            bet_array_list_replace_planned_line_by_transfert ( tab_model, transfert );
+    }
+}
+
+
 /*
  * Met à jour les données à afficher dans les différentes vues du module
  *
@@ -480,6 +509,8 @@ void bet_array_refresh_estimate_tab ( gint account_number )
                         date_min,
                         date_max );
 
+    bet_array_list_replace_scheduled_by_transfert ( tree_model, account_number );
+
     /* shows the balance at beginning of month */
     bet_array_shows_balance_at_beginning_of_month ( tree_model, date_min, date_max );
 
@@ -2610,8 +2641,8 @@ gboolean bet_array_refresh_transfert_data ( GtkTreeModel *tab_model,
 
     devel_debug (NULL);
 
-    account_number = gsb_gui_navigation_get_current_account ( );
-    transfert_list = bet_data_transfert_get_list ( );
+    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 ) )
@@ -2684,8 +2715,6 @@ gboolean bet_array_refresh_transfert_data ( GtkTreeModel *tab_model,
                         SPP_ESTIMATE_TREE_AMOUNT_COLUMN, str_amount,
                         -1);
 
-        if (  transfert -> replace_transaction )
-            bet_array_list_replace_planned_line_by_transfert ( tab_model, transfert );
         g_value_unset ( &date_value );
         g_free ( str_date );
         g_free ( str_description );


hooks/post-receive
-- 
grisbi