[grisbi-cvs] grisbi/src gsb_file_load.c,1.170,1.171

[Pierre Biava]

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

Modified Files:
	gsb_file_load.c 
Log Message:
ignores the operations with P = 2 and R = 0

Index: gsb_file_load.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_load.c,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -d -r1.170 -r1.171
--- gsb_file_load.c	3 May 2009 13:32:44 -0000	1.170
+++ gsb_file_load.c	3 May 2009 14:30:18 -0000	1.171
@@ -7488,23 +7488,23 @@
 	    while ( list_tmp_transactions )
 	    {
             gint transaction_number;
-            
+            gint reconcile_number;
+
             transaction_number = gsb_data_transaction_get_transaction_number (
                         list_tmp_transactions -> data);
 
             /* ok first we work only with reconciled transactions */
             if ( gsb_data_transaction_get_marked_transaction (
-                            transaction_number) == OPERATION_RAPPROCHEE )
+                            transaction_number) == OPERATION_RAPPROCHEE &&
+                (reconcile_number = gsb_data_transaction_get_reconcile_number (
+                        transaction_number)) > 0 )
             {
-                gint reconcile_number;
                 gint account_number;
                 gint reconcile_account;
                 const GDate *date_reconcile;
                 const GDate *date_transaction;
                 gboolean trouve = FALSE;
 
-                reconcile_number = gsb_data_transaction_get_reconcile_number (
-                        transaction_number );
                 reconcile_account = gsb_data_reconcile_get_account ( reconcile_number );
 
                 account_number = gsb_data_transaction_get_account_number (