[grisbi-cvs] grisbi/src import.c,1.311,1.312

[Pierre Biava]

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

Modified Files:
	import.c 
Log Message:
modified sorting for the import of transactions

Index: import.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/import.c,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -d -r1.311 -r1.312
--- import.c	16 Dec 2009 21:38:00 -0000	1.311
+++ import.c	19 Dec 2009 04:31:57 -0000	1.312
@@ -1992,7 +1992,6 @@
 
                 transaction_number = gsb_data_transaction_get_transaction_number (
                         list_tmp_transactions -> data);
-
                 if ( gsb_data_transaction_get_account_number (
                  transaction_number ) == account_number
                  &&
@@ -2007,13 +2006,15 @@
                      &&
                      !imported_transaction -> ope_de_ventilation
                      &&
-                     !gsb_data_transaction_get_id ( transaction_number ) )
+                     ( !etat.get_fusion_import_transactions
+                     ||
+                     !gsb_data_transaction_get_id ( transaction_number ) ) )
                     {
-                        /* the imported transaction has the same date and same amount,
-                         * will ask the user */
-                        imported_transaction -> action = IMPORT_TRANSACTION_ASK_FOR_TRANSACTION;
-                        imported_transaction -> ope_correspondante = transaction_number;
-                        demande_confirmation = TRUE;
+                    /* the imported transaction has the same date and same amount,
+                     * will ask the user */
+                    imported_transaction -> action = IMPORT_TRANSACTION_ASK_FOR_TRANSACTION;
+                    imported_transaction -> ope_correspondante = transaction_number;
+                    demande_confirmation = TRUE;
                     }
                 }
                 list_tmp_transactions = list_tmp_transactions -> next;