[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_7_4-81-g5283f8c

[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  5283f8c863b089a293f9691538dda49ae31f59bc (commit)
       via  c6454568137e56ad2650952f67039f9369bce6cf (commit)
      from  7cddda1cc218619ac823470c841e6bb0e5f37ee3 (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 5283f8c863b089a293f9691538dda49ae31f59bc
Author: pbiava <pierre.biava at nerim.net>
Date:   Wed Nov 10 22:54:04 2010 +0100

    fixes a bug of updating the home page after an import a file of transactions

commit c6454568137e56ad2650952f67039f9369bce6cf
Author: pbiava <pierre.biava at nerim.net>
Date:   Sun Nov 7 21:48:36 2010 +0100

    fixes bug 1163

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

Changes:
diff --git a/src/import.c b/src/import.c
index 2d399f0..8ffbff7 100644
--- a/src/import.c
+++ b/src/import.c
@@ -159,6 +159,7 @@ static void traitement_operations_importees ( void );
 /*END_STATIC*/
 
 /*START_EXTERN*/
+extern gboolean balances_with_scheduled;
 extern GtkWidget *menu_import_rules;
 extern gint mise_a_jour_liste_comptes_accueil;
 extern gint mise_a_jour_soldes_minimaux;
@@ -1521,8 +1522,11 @@ void traitement_operations_importees ( void )
         break;
     }
 
-        /* MAJ des données du module bet */
-        gsb_data_account_set_bet_maj ( account_number, BET_MAJ_ALL );
+    /* MAJ du solde du compte nécessaire suivant date des opérations existantes */
+    if ( balances_with_scheduled == FALSE )
+        gsb_data_account_set_balances_are_dirty ( account_number );
+    /* MAJ des données du module bet */
+    gsb_data_account_set_bet_maj ( account_number, BET_MAJ_ALL );
 
     /* first, we create the rule if asked */
     if (compte -> create_rule && compte -> action != IMPORT_CREATE_ACCOUNT)
@@ -4422,6 +4426,10 @@ gboolean gsb_import_by_rule ( gint rule )
     mise_a_jour_soldes_minimaux = 1;
     mise_a_jour_accueil (FALSE);
 
+    /* MAJ du solde du compte nécessaire suivant date des opérations existantes */
+    if ( balances_with_scheduled == FALSE )
+        gsb_data_account_set_balances_are_dirty ( account_number );
+
     /* force the update module budget */
     gsb_data_account_set_bet_maj ( account_number, BET_MAJ_ALL );
 
diff --git a/src/utils_dates.c b/src/utils_dates.c
index 1941392..fbf6069 100644
--- a/src/utils_dates.c
+++ b/src/utils_dates.c
@@ -387,10 +387,15 @@ GDate *gsb_parse_date_string ( const gchar *date_string )
 	}
 	g_strfreev(tab_format);
 #else
-    if ( g_str_has_prefix ( g_getenv ( "LANG"), "en_" ) )
+{
+    const gchar *langue;
+
+    langue = g_getenv ( "LANG");
+    if ( g_str_has_prefix ( langue, "en_" ) || g_str_has_prefix ( langue, "cs_" ) )
         format = g_strndup ( "%m/%d/%Y", 8 );
     else
         format = nl_langinfo ( D_FMT );
+}
 #endif
 
     while ( * format )
@@ -605,6 +610,7 @@ gchar *gsb_format_date ( gint day, gint month, gint year )
 gchar *gsb_format_gdate ( const GDate *date )
 {
     gchar retour_str[SIZEOF_FORMATTED_STRING_DATE];
+    const gchar *langue;
     guint longueur;
 
     if ( !date || !g_date_valid ( date ) )
@@ -612,7 +618,8 @@ gchar *gsb_format_gdate ( const GDate *date )
         return my_strdup ( "" );
     }
 
-    if ( g_str_has_prefix ( g_getenv ( "LANG"), "en_" ) )
+    langue = g_getenv ( "LANG");
+    if ( g_str_has_prefix ( langue, "en_" ) || g_str_has_prefix ( langue, "cs_" ) )
         longueur = g_date_strftime ( retour_str, SIZEOF_FORMATTED_STRING_DATE, "%m/%d/%Y", date );
     else
         longueur = g_date_strftime ( retour_str, SIZEOF_FORMATTED_STRING_DATE, "%x", date );


hooks/post-receive
-- 
grisbi