[grisbi-cvs] grisbi/src gsb_account_property.c, 1.13, 1.14 gsb_currency_config.c, 1.39, 1.40 gsb_data_currency.c, 1.17, 1.18

[Pierre Biava]

Update of /cvsroot/grisbi/grisbi/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv328/src

Modified Files:
	gsb_account_property.c gsb_currency_config.c 
	gsb_data_currency.c 
Log Message:
correction gestion des devises. merci de controler si des regressiosn existent.
correction management of currencies. thank you for controlling if declines exist.

Index: gsb_account_property.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_account_property.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gsb_account_property.c	11 Dec 2008 20:26:33 -0000	1.13
+++ gsb_account_property.c	13 Dec 2008 20:33:42 -0000	1.14
@@ -652,6 +652,7 @@
     account_number = gsb_gui_navigation_get_current_account ();
 
     account_currency_number = gsb_data_account_get_currency (account_number);
+
     new_currency_number = gsb_currency_get_currency_from_combobox (detail_devise_compte);
 
     /* set the new currency, must set here and no in the autofunc directly  */

Index: gsb_data_currency.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_currency.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- gsb_data_currency.c	30 Sep 2008 15:32:23 -0000	1.17
+++ gsb_data_currency.c	13 Dec 2008 20:33:42 -0000	1.18
@@ -192,6 +192,7 @@
 
 	tmp = tmp -> next;
     }
+
     return number_tmp;
 }
 

Index: gsb_currency_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_currency_config.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- gsb_currency_config.c	7 Dec 2008 22:57:51 -0000	1.39
+++ gsb_currency_config.c	13 Dec 2008 20:33:42 -0000	1.40
@@ -361,7 +361,7 @@
 		       GTK_EXPAND | GTK_FILL, 0, 0, 0 );
     g_object_set_data ( G_OBJECT(currency_tree_model), "entry_name", entry );
 
-    /* Create code entry */
+    /* Create Sign entry */
     label = gtk_label_new (COLON(_("Sign")));
     gtk_misc_set_alignment (GTK_MISC (label), 0, 1);
     gtk_label_set_justify ( GTK_LABEL(label), GTK_JUSTIFY_RIGHT );
@@ -374,7 +374,7 @@
 		       GTK_EXPAND | GTK_FILL, 0, 0, 0 );
     g_object_set_data ( G_OBJECT(currency_tree_model), "entry_code", entry );
 
-    /* Create code entry */
+    /* Create ISO code entry */
     label = gtk_label_new ( COLON(_("ISO code")) );
     gtk_misc_set_alignment (GTK_MISC (label), 0, 1);
     gtk_label_set_justify ( GTK_LABEL(label), GTK_JUSTIFY_RIGHT );
@@ -1009,15 +1009,15 @@
 		 (strlen ( currency_code ) ||
 		  strlen ( currency_isocode )))
 	    {
-		/* check if the currency exists */
+		/* check if the currency exists si la devise existe on ne fait rien */
 
 		if ( gsb_data_currency_get_number_by_name ( currency_name ) )
 		{
-		    currency_number = gsb_data_currency_get_number_by_name ( currency_name );
+		    currency_number = 0;
 		}
 		else if ( gsb_data_currency_get_number_by_code_iso4217 ( currency_isocode ) )
 		{
-		    currency_number = gsb_data_currency_get_number_by_code_iso4217 ( currency_isocode );
+		    currency_number = 0;
 		}
 		else
 		{
@@ -1026,9 +1026,15 @@
 		}
 
 		/* update the currency list for combobox */
-		gsb_currency_update_combobox_currency_list ();
+        /* mise en commentaire car introduit deux bugs 
+         * 1) passage à 0 des variaables no_devise_totaux_categ, no_devise_totaux_ib,
+         *    no_devise_totaux_tiers dans le fichier gribi;
+         * 2) bug affichage de la liste des opérations (passage à 0 de la devise du 
+         *    premier compte de la liste des comptes */
 
-		if ( currency_tree_model )
+		//~ gsb_currency_update_combobox_currency_list ();
+
+		if ( currency_tree_model && currency_number > 0 )
 		{
 		    gsb_currency_append_currency_to_list ( GTK_LIST_STORE ( currency_tree_model ),
 							   currency_number );