X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fhomebank;a=blobdiff_plain;f=src%2Frep-balance.c;fp=src%2Frep_balance.c;h=2b70dbd9c5d520bb5079a1ad4f5d8953020062f3;hp=5c6359a4365f5642a02e6888f2824d02ba619228;hb=a6c6b0df5492c2160ed97e3a376bdb2fe7c5ebc4;hpb=cd13d9691c46c2b2d6d459e9e6a76bed1c21b7a6

diff --git a/src/rep_balance.c b/src/rep-balance.c
similarity index 98%
rename from src/rep_balance.c
rename to src/rep-balance.c
index 5c6359a..2b70dbd 100644
--- a/src/rep_balance.c
+++ b/src/rep-balance.c
@@ -1,5 +1,5 @@
 /*  HomeBank -- Free, easy, personal accounting for everyone.
- *  Copyright (C) 1995-2018 Maxime DOYEN
+ *  Copyright (C) 1995-2019 Maxime DOYEN
  *
  *  This file is part of HomeBank.
  *
@@ -20,14 +20,14 @@
 
 #include "homebank.h"
 
-#include "rep_balance.h"
+#include "rep-balance.h"
 
-#include "list_operation.h"
+#include "list-operation.h"
 #include "gtk-chart.h"
 #include "gtk-dateentry.h"
 
 #include "ui-account.h"
-#include "dsp_mainwindow.h"
+#include "dsp-mainwindow.h"
 #include "ui-transaction.h"
 
 
@@ -80,7 +80,7 @@ static GtkRadioActionEntry radio_entries[] = {
 static guint n_radio_entries = G_N_ELEMENTS (radio_entries);
 
 static GtkActionEntry entries[] = {
-  { "Refresh" , ICONNAME_REFRESH   , N_("Refresh"), NULL,   N_("Refresh results"), G_CALLBACK (repbalance_action_refresh) },
+  { "Refresh" , ICONNAME_HB_REFRESH   , N_("Refresh"), NULL,   N_("Refresh results"), G_CALLBACK (repbalance_action_refresh) },
 };
 
 static guint n_entries = G_N_ELEMENTS (entries);
@@ -635,7 +635,7 @@ struct repbalance_data *data;
 GtkTreeModel *model;
 GtkTreeIter  iter;
 guint32 acckey, i;
-gboolean selectall, eachday;
+gboolean range, selectall, eachday;
 Account *acc;
 
 	DB( g_print(" \n[repbalance] compute\n") );
@@ -644,7 +644,8 @@ Account *acc;
 
 	selectall = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_selectall));
 	eachday = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_eachday));
-
+	range = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_range));
+	
 	// get the account key
 	acckey = ui_acc_comboboxentry_get_key(GTK_COMBO_BOX(data->PO_acc));
 
@@ -676,7 +677,8 @@ Account *acc;
 
 	//to remove > 5.0.2
 	//#1715532 5.0.5: no... but only selectall
-	if(selectall == TRUE)
+	//#1756601 but only for FLT_RANGE_ALLDATE
+	if( (selectall == TRUE) && (range == FLT_RANGE_ALLDATE) )
 	{
 		filter_preset_daterange_set(data->filter, data->filter->range, data->accnum);
 		repbalance_update_quickdate(widget, NULL);
@@ -797,8 +799,8 @@ static void repbalance_setup(struct repbalance_data *data, guint32 accnum)
 
 	data->ope_list = NULL;
 
-	data->filter = da_filter_malloc();
-	filter_default_all_set(data->filter);
+	data->filter = da_flt_malloc();
+	filter_reset(data->filter);
 
 	data->accnum = accnum;
 	filter_preset_daterange_set(data->filter, PREFS->date_range_rep, data->accnum);
@@ -822,7 +824,7 @@ struct WinGeometry *wg;
 
 	g_list_free (data->ope_list);
 
-	da_filter_free(data->filter);
+	da_flt_free(data->filter);
 
 	g_free(data);