← Back to branch summary

~mdoyen/homebank/5.3.x

« back to all changes in this revision

Viewing changes to src/rep-time.c

  • Committer: Maxime Doyen
  • Date: 2019-05-25 07:29:57 UTC
  • Revision ID: homebank@free.fr-20190525072957-35m6fho2msvt86ko
5.2.6 release

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/rep-time.c
265
265
        gtk_date_entry_set_mindate(GTK_DATE_ENTRY(data->PO_maxdate), data->filter->mindate);
266
266
 
267
267
        g_signal_handler_block(data->CY_range, data->handler_id[HID_REPTIME_RANGE]);
268
 
        gtk_combo_box_set_active(GTK_COMBO_BOX(data->CY_range), FLT_RANGE_OTHER);
 
268
        hbtk_combo_box_set_active_id(GTK_COMBO_BOX_TEXT(data->CY_range), FLT_RANGE_OTHER);
269
269
        g_signal_handler_unblock(data->CY_range, data->handler_id[HID_REPTIME_RANGE]);
270
270
 
271
271
        ui_reptime_compute(widget, NULL);
303
303
 
304
304
        data = g_object_get_data(G_OBJECT(gtk_widget_get_ancestor(widget, GTK_TYPE_WINDOW)), "inst_data");
305
305
 
306
 
        range = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_range));
 
306
        range = hbtk_combo_box_get_active_id(GTK_COMBO_BOX_TEXT(data->CY_range));
307
307
 
308
308
        if(range != FLT_RANGE_OTHER)
309
309
        {
618
618
                                pos = report_interval_get_pos(tmpintvl, from, ope);
619
619
                                if( pos == active )
620
620
                                {
 
621
                                gdouble dtlamt = report_txn_amount_get(data->filter, ope);
 
622
 
621
623
                                        gtk_list_store_insert_with_values (GTK_LIST_STORE(model), &iter, -1,
622
 
                                                LST_DSPOPE_DATAS, ope,
 
624
                                                MODEL_TXN_POINTER, ope,
 
625
                                            MODEL_TXN_SPLITAMT, dtlamt,
623
626
                                                -1);
624
627
                                }
625
628
                        }
663
666
        tmpintvl  = hbtk_combo_box_get_active_id(GTK_COMBO_BOX_TEXT(data->CY_intvl));
664
667
        cumul     = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_cumul));
665
668
        showall   = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_all));
666
 
        range     = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_range));
 
669
        range     = hbtk_combo_box_get_active_id(GTK_COMBO_BOX_TEXT(data->CY_range));
667
670
        showempty = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_showempty));
668
671
 
669
672
        selkey = 0;
739
742
 
740
743
                                trn_amount = report_txn_amount_get(data->filter, ope);
741
744
 
742
 
                                if( tmpsrc == REPORT_SRC_ACCOUNT && showall == TRUE )
 
745
                                 //#1829603 Multi currencies problem in Trend Time Report 
 
746
                                if( ! ( tmpsrc == REPORT_SRC_ACCOUNT && showall == FALSE) )
743
747
                                        trn_amount = hb_amount_base(trn_amount, ope->kcur);
744
748
                                
745
749
                                pos = report_interval_get_pos(tmpintvl, from, ope);
1269
1273
        row++;
1270
1274
        label = make_label_widget(_("_Range:"));
1271
1275
        gtk_grid_attach (GTK_GRID (table), label, 1, row, 1, 1);
1272
 
        data->CY_range = make_daterange(label, FALSE);
 
1276
        data->CY_range = make_daterange(label, DATE_RANGE_CUSTOM_DISABLE);
1273
1277
        gtk_grid_attach (GTK_GRID (table), data->CY_range, 2, row, 1, 1);
1274
1278
 
1275
1279
        row++;
1514
1518
        DB( g_print("range: %d\n", PREFS->date_range_rep) );
1515
1519
 
1516
1520
        if( PREFS->date_range_rep != 0)
1517
 
                gtk_combo_box_set_active(GTK_COMBO_BOX(data->CY_range), PREFS->date_range_rep);
 
1521
                hbtk_combo_box_set_active_id(GTK_COMBO_BOX_TEXT(data->CY_range), PREFS->date_range_rep);
1518
1522
        else
1519
1523
                ui_reptime_compute(window, NULL);
1520
1524