[grisbi-cvs] [SCM] grisbi branch, master, updated. 27369bb2260bad4e70f5a89e24442f10ab62a3b0

[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  27369bb2260bad4e70f5a89e24442f10ab62a3b0 (commit)
       via  cfcc24b1f7f61c4524605d40ed57f2b7312a313d (commit)
      from  9e5f955117062abbfdd4ae61ba3c7c398e359474 (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 27369bb2260bad4e70f5a89e24442f10ab62a3b0
Author: pbiava <pierre.biava at nerim.net>
Date:   Tue Aug 17 04:39:36 2010 +0200

    fixed bug 1150

commit cfcc24b1f7f61c4524605d40ed57f2b7312a313d
Author: pbiava <pierre.biava at nerim.net>
Date:   Tue Aug 17 04:38:29 2010 +0200

    Switching to development mode

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

Changes:
diff --git a/src/gsb_reconcile.c b/src/gsb_reconcile.c
index 54a17a0..6a6f307 100644
--- a/src/gsb_reconcile.c
+++ b/src/gsb_reconcile.c
@@ -43,6 +43,7 @@
 #include "fenetre_principale.h"
 #include "gsb_real.h"
 #include "gsb_reconcile_list.h"
+#include "gsb_scheduler_list.h"
 #include "gsb_transactions_list.h"
 #include "utils_editables.h"
 #include "traitement_variables.h"
@@ -97,6 +98,8 @@ static gint reconcile_save_rows_number;
 static gint reconcile_save_show_marked;
 static gint reconcile_save_account_display;
 
+/* backup the number of the last transaction converted into planned transaction during the reconciliation */
+static gint reconcile_save_last_scheduled_convert = 0;
 
 
 /**
@@ -609,6 +612,15 @@ gboolean gsb_reconcile_finish_reconciliation ( GtkWidget *button,
 
     if ( etat.modification_fichier == 0 )
         modification_fichier ( TRUE );
+
+    if ( reconcile_save_last_scheduled_convert )
+    {
+        gsb_gui_navigation_set_selection ( GSB_SCHEDULER_PAGE, 0, NULL );
+        gsb_scheduler_list_select ( reconcile_save_last_scheduled_convert );
+        gsb_scheduler_list_edit_transaction ( reconcile_save_last_scheduled_convert );
+        reconcile_save_last_scheduled_convert = 0;
+    }
+
     return FALSE;
 }
 
@@ -777,6 +789,21 @@ gboolean gsb_reconcile_entry_lose_focus ( GtkWidget *entry,
 
     return FALSE;
 }
+
+
+/**
+ *
+ *
+ *
+ *
+ * */
+gboolean gsb_reconcile_set_last_scheduled_transaction ( gint scheduled_transaction )
+{
+    reconcile_save_last_scheduled_convert = scheduled_transaction;
+
+    return FALSE;
+}
+
 /* Local Variables: */
 /* c-basic-offset: 4 */
 /* End: */
diff --git a/src/gsb_reconcile.h b/src/gsb_reconcile.h
index 8e9d411..c74bf50 100644
--- a/src/gsb_reconcile.h
+++ b/src/gsb_reconcile.h
@@ -9,6 +9,7 @@
 GtkWidget *gsb_reconcile_create_box ( void );
 gboolean gsb_reconcile_run_reconciliation ( GtkWidget *button,
                         gpointer null );
+gboolean gsb_reconcile_set_last_scheduled_transaction ( gint scheduled_transaction );
 gboolean gsb_reconcile_update_amounts ( GtkWidget *entry,
 					    gpointer null );
 /* END_DECLARATION */
diff --git a/src/gsb_transactions_list.c b/src/gsb_transactions_list.c
index dc3b578..5e9cfbb 100644
--- a/src/gsb_transactions_list.c
+++ b/src/gsb_transactions_list.c
@@ -2731,15 +2731,21 @@ void schedule_selected_transaction ()
     gint scheduled_number;
 
     if (!assert_selected_transaction())
-	return;
+        return;
 
-    scheduled_number = schedule_transaction ( gsb_data_account_get_current_transaction_number (gsb_gui_navigation_get_current_account ()));
+    scheduled_number = schedule_transaction ( gsb_data_account_get_current_transaction_number (
+                                    gsb_gui_navigation_get_current_account () ) );
 
     mise_a_jour_liste_echeances_auto_accueil = 1;
 
-    gsb_gui_navigation_set_selection (GSB_SCHEDULER_PAGE, 0, NULL);
-    gsb_scheduler_list_select (scheduled_number);
-    gsb_scheduler_list_edit_transaction (scheduled_number);
+    if ( etat.equilibrage == 0 )
+    {
+        gsb_gui_navigation_set_selection (GSB_SCHEDULER_PAGE, 0, NULL);
+        gsb_scheduler_list_select (scheduled_number);
+        gsb_scheduler_list_edit_transaction (scheduled_number);
+    }
+    else
+        gsb_reconcile_set_last_scheduled_transaction ( scheduled_number );
 
     if ( etat.modification_fichier == 0 )
         modification_fichier ( TRUE );
diff --git a/src/structures.h b/src/structures.h
index 1bfa819..a558a0b 100644
--- a/src/structures.h
+++ b/src/structures.h
@@ -13,7 +13,7 @@
 #define VERSION_FICHIER "0.6.0"
 
 /* Define this when in Git 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"


hooks/post-receive
-- 
grisbi