[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9_5-70-gd038466

[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  d0384662bc590d716f32c13068b6b7eeacc6ec43 (commit)
      from  6c1ce8e861bbdc9a0f00ca7c746250073a9dc0e7 (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 d0384662bc590d716f32c13068b6b7eeacc6ec43
Author: pbiava <pierre.biava at nerim.net>
Date:   Wed Mar 7 20:03:46 2012 +0100

    fixed bug 1473: display budgetary lines for scheduled transactions in budgetary modul

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

Changes:
diff --git a/src/bet_tab.c b/src/bet_tab.c
index a4c986e..ce6fede 100644
--- a/src/bet_tab.c
+++ b/src/bet_tab.c
@@ -792,8 +792,8 @@ void bet_array_refresh_scheduled_data ( GtkTreeModel *tab_model,
 
         tmp_list = tmp_list->next;
 
-        /* ignore children scheduled operations */
-        if (gsb_data_scheduled_get_mother_scheduled_number ( scheduled_number ) )
+         /* ignore splitted transactions */
+        if ( gsb_data_scheduled_get_split_of_scheduled ( scheduled_number ) == TRUE )
             continue;
 
         /* ignores transactions replaced with historical data */
@@ -881,14 +881,13 @@ void bet_array_refresh_scheduled_data ( GtkTreeModel *tab_model,
                 date = gsb_scheduler_get_next_date ( scheduled_number, date );
                 continue;
             }
-            if ( g_date_valid ( date ) == FALSE )
+            if ( date == NULL || g_date_valid ( date ) == FALSE )
                 return;
+
             str_date = gsb_format_gdate ( date );
 
-            if ( date == NULL )
-                return;
             g_value_init ( &date_value, G_TYPE_DATE );
-            g_value_set_boxed ( &date_value, date ); 
+            g_value_set_boxed ( &date_value, date );
 
             /* add a line in the estimate array */
             gtk_tree_store_append ( GTK_TREE_STORE ( tab_model ), &iter, NULL );


hooks/post-receive
-- 
grisbi