[grisbi-cvs] grisbi/src import.c,1.309,1.310

[Pierre Biava]

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

Modified Files:
	import.c 
Log Message:
fixed a bug when adding a transaction unfused

Index: import.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/import.c,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -d -r1.309 -r1.310
--- import.c	10 Dec 2009 22:02:33 -0000	1.309
+++ import.c	12 Dec 2009 09:25:24 -0000	1.310
@@ -2248,6 +2248,14 @@
             if ( ope_import -> operation_ventilee )
                 action_derniere_ventilation = 0;
         }
+        else if ( etat.get_fusion_import_transactions &&
+                        ope_import -> ope_correspondante > 0 )
+        {
+            ope_import -> action = 0;
+            if ( ope_import -> operation_ventilee )
+                action_derniere_ventilation = 0;
+            ope_import -> ope_correspondante = 0;
+        }
         list_tmp = list_tmp -> next;
     }