[grisbi-cvs] grisbi/src gsb_data_transaction.c, 1.76, 1.77 gsb_data_transaction.h, 1.35, 1.36 gsb_file_load.c, 1.193, 1.194 gsb_file_save.c, 1.143, 1.144 import.c, 1.308, 1.309 structures.h, 1.236, 1.237 transaction_list_sort.c, 1.1, 1.2

[Pierre Biava]

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

Modified Files:
	gsb_data_transaction.c gsb_data_transaction.h gsb_file_load.c 
	gsb_file_save.c import.c structures.h transaction_list_sort.c 
Log Message:
fixed bugs 770 772 775

Index: structures.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/structures.h,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -d -r1.236 -r1.237
--- structures.h	11 Oct 2009 16:24:34 -0000	1.236
+++ structures.h	10 Dec 2009 22:02:33 -0000	1.237
@@ -94,7 +94,7 @@
 
     /* import rules */
     gint get_extract_number_for_check;          /* TRUE if Extracting a number and save it in the field No Cheque/Virement */
-    gint get_fusion_import_planed_transactions; /* TRUE if merge transactions imported with planned transactions */
+    gint get_fusion_import_transactions; /* TRUE if merge transactions imported with transactions found*/
     gint get_categorie_for_payee;               /* TRUE to automatically retrieve the category of the payee if it exists */
     gint get_fyear_by_value_date;               /* TRUE to get the fyear by value date, FALSE by date */
 

Index: gsb_data_transaction.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_transaction.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- gsb_data_transaction.c	28 Nov 2009 19:58:12 -0000	1.76
+++ gsb_data_transaction.c	10 Dec 2009 22:02:32 -0000	1.77
@@ -2407,6 +2407,42 @@
 
 
 /**
+ * find a transaction by the method of payment content in a given account
+ *
+ * \param string
+ * \param account_number
+ *
+ * \return the number of the transaction or 0 if not found
+ * */
+gint gsb_data_transaction_find_by_payment_content ( const gchar *string,
+                        gint account_number )
+{
+    GSList *tmp_list;
+
+    if (!string)
+	return 0;
+
+    tmp_list = transactions_list;
+    while (tmp_list)
+    {
+	struct_transaction *transaction;
+
+	transaction = tmp_list -> data;
+
+	if ( transaction -> method_of_payment_content
+	     &&
+	     transaction -> account_number == account_number
+	     &&
+	     !strcmp ( string,
+		       transaction -> method_of_payment_content ))
+	    return transaction -> transaction_number;
+	tmp_list = tmp_list -> next;
+    }
+    return 0;
+}
+
+
+/**
  * find a transaction by its id
  *
  * \param id a string containing an id

Index: transaction_list_sort.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/transaction_list_sort.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- transaction_list_sort.c	28 Aug 2008 21:49:40 -0000	1.1
+++ transaction_list_sort.c	10 Dec 2009 22:02:33 -0000	1.2
@@ -95,6 +95,17 @@
 
     for (i = 0; i < custom_list->num_visibles_rows; ++i)
     {
+        //~ CustomRecord *record;
+        //~ gint transaction_number;
+
+        //~ record = custom_list -> visibles_rows[i];
+        //~ transaction_number = gsb_data_transaction_get_transaction_number (
+                        //~ record -> transaction_pointer);
+        //~ printf ("pos = %d date = %s transaction_number = %d\n",
+                        //~ i,
+                        //~ gsb_format_gdate ( gsb_data_transaction_get_date (
+                        //~ transaction_number ) ),
+                        //~ transaction_number);
 	neworder[i] = (custom_list->visibles_rows[i])->filtered_pos;
 	(custom_list->visibles_rows[i])->filtered_pos = i;
     }

Index: gsb_file_save.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_save.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- gsb_file_save.c	18 Oct 2009 17:46:21 -0000	1.143
+++ gsb_file_save.c	10 Dec 2009 22:02:33 -0000	1.144
@@ -679,7 +679,7 @@
 					   "\t\tScheduler_custom_menu=\"%d\"\n"
 					   "\t\tImport_interval_search=\"%d\"\n"
                        "\t\tImport_extract_number_for_check=\"%d\"\n"
-					   "\t\tImport_fusion_planned_transactions=\"%d\"\n"
+					   "\t\tImport_fusion_transactions=\"%d\"\n"
                        "\t\tImport_categorie_for_payee=\"%d\"\n"
 					   "\t\tImport_fyear_by_value_date=\"%d\"\n"
 					   "\t\tUse_logo=\"%d\"\n"
@@ -717,7 +717,7 @@
 	affichage_echeances_perso_j_m_a,
 	valeur_echelle_recherche_date_import,
 	etat.get_extract_number_for_check,
-	etat.get_fusion_import_planed_transactions,
+	etat.get_fusion_import_transactions,
 	etat.get_categorie_for_payee,
 	etat.get_fyear_by_value_date,
 	etat.utilise_logo,

Index: gsb_data_transaction.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_transaction.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- gsb_data_transaction.h	28 Nov 2009 19:58:12 -0000	1.35
+++ gsb_data_transaction.h	10 Dec 2009 22:02:32 -0000	1.36
@@ -23,6 +23,8 @@
 gboolean gsb_data_transaction_copy_transaction ( gint source_transaction_number,
                         gint target_transaction_number );
 gint gsb_data_transaction_find_by_id ( gchar *id, gint account_number );
+gint gsb_data_transaction_find_by_payment_content ( const gchar *string,
+                        gint account_number );
 gint gsb_data_transaction_get_account_number ( gint transaction_number );
 gsb_real gsb_data_transaction_get_adjusted_amount ( gint transaction_number,
                         gint return_exponent );

Index: import.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/import.c,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -d -r1.308 -r1.309
--- import.c	29 Nov 2009 20:47:52 -0000	1.308
+++ import.c	10 Dec 2009 22:02:33 -0000	1.309
@@ -126,8 +126,10 @@
                         gint account_number, gchar * origine );
 static gboolean gsb_import_define_action ( struct struct_compte_importation *imported_account,
                         gint account_number,
-                        GDate *first_date_import );
+                        GDate *first_date_import,
+                        GDate *last_date_import );
 static GDate *gsb_import_get_first_date ( GSList *import_list );
+static GDate *gsb_import_get_last_date ( GSList *import_list );
 static gboolean gsb_import_gunzip_file ( gchar *filename );
 static gboolean gsb_import_set_id_compte ( gint account_nb, gchar *imported_id );
 static gboolean gsb_import_set_tmp_file ( gchar *filename,
[...1221 lines suppressed...]
+                    g_list_free ( list );
+                    break;
+                }
+                list = list -> next;
+            }
+        }
+        if ( GTK_IS_TOGGLE_BUTTON ( widget ) )
+        {
+            if ( test != gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( widget ) ) )
+                return FALSE;
+        }
+        children = children -> next;
+    }
+    g_list_free ( children );
+
+    return TRUE;
+}
 /* Local Variables: */
 /* c-basic-offset: 4 */
 /* End: */

Index: gsb_file_load.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_load.c,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -d -r1.193 -r1.194
--- gsb_file_load.c	10 Dec 2009 15:06:47 -0000	1.193
+++ gsb_file_load.c	10 Dec 2009 22:02:32 -0000	1.194
@@ -799,9 +799,9 @@
     }
 
     else if ( !strcmp ( attribute_names[i],
-                        "Import_fusion_planned_transactions" ))
+                        "Import_fusion_transactions" ))
     {
-        etat.get_fusion_import_planed_transactions = utils_str_atoi ( attribute_values[i]);
+        etat.get_fusion_import_transactions = utils_str_atoi ( attribute_values[i]);
     }
 
     else if ( !strcmp ( attribute_names[i],