[grisbi-cvs] grisbi/src gsb_form_config.c, 1.33, 1.34 import.c, 1.310, 1.311

[Pierre Biava]

Update of /cvsroot/grisbi/grisbi/src
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv23129/src

Modified Files:
	gsb_form_config.c import.c 
Log Message:
fixed bug 764 and minor correction of import.c

Index: import.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/import.c,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -d -r1.310 -r1.311
--- import.c	12 Dec 2009 09:25:24 -0000	1.310
+++ import.c	16 Dec 2009 21:38:00 -0000	1.311
@@ -2005,7 +2005,9 @@
                      g_date_compare ( gsb_data_transaction_get_date (
                      transaction_number), last_date_import ) <= 0
                      &&
-                     !imported_transaction -> ope_de_ventilation )
+                     !imported_transaction -> ope_de_ventilation
+                     &&
+                     !gsb_data_transaction_get_id ( transaction_number ) )
                     {
                         /* the imported transaction has the same date and same amount,
                          * will ask the user */

Index: gsb_form_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_form_config.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- gsb_form_config.c	24 Aug 2009 14:03:03 -0000	1.33
+++ gsb_form_config.c	16 Dec 2009 21:37:59 -0000	1.34
@@ -681,9 +681,7 @@
 
 	for ( i=0 ; i < gsb_data_form_get_nb_rows (account_number) ; i++)
 	    for ( j=0 ; j < gsb_data_form_get_nb_columns (account_number) ; j++ )
-		if ( !gsb_data_form_get_value (account_number,
-					       j,
-					       i ))
+		if ( !gsb_data_form_get_value ( account_number, j, i ) )
 		{
 		    /* if only 1 element, end here, else continue to look after the second one */
 		    if ( no_second_element == -1 )
@@ -806,6 +804,8 @@
     gsb_form_config_fill_store (account_number);
     gsb_form_fill_from_account (account_number);
 
+    gsb_form_config_update_from_account (
+                        gsb_account_get_combo_account_number ( accounts_combobox ) );
     if ( etat.modification_fichier == 0 )
         modification_fichier ( TRUE );
     return FALSE;