← Back to branch summary

~mdoyen/homebank/5.2.x

« back to all changes in this revision

Viewing changes to src/rep-budget.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-budget.c
248
248
        gtk_date_entry_set_mindate(GTK_DATE_ENTRY(data->PO_maxdate), data->filter->mindate);
249
249
 
250
250
        g_signal_handler_block(data->CY_range, data->handler_id[HID_REPBUDGET_RANGE]);
251
 
        gtk_combo_box_set_active(GTK_COMBO_BOX(data->CY_range), FLT_RANGE_OTHER);
 
251
        hbtk_combo_box_set_active_id(GTK_COMBO_BOX_TEXT(data->CY_range), FLT_RANGE_OTHER);
252
252
        g_signal_handler_unblock(data->CY_range, data->handler_id[HID_REPBUDGET_RANGE]);
253
253
 
254
254
 
267
267
 
268
268
        data = g_object_get_data(G_OBJECT(gtk_widget_get_ancestor(widget, GTK_TYPE_WINDOW)), "inst_data");
269
269
 
270
 
        range = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_range));
 
270
        range = hbtk_combo_box_get_active_id(GTK_COMBO_BOX_TEXT(data->CY_range));
271
271
        
272
272
 
273
273
        if(range != FLT_RANGE_OTHER)
535
535
                {
536
536
                Account *acc;
537
537
                Transaction *ope = list->data;
 
538
                gdouble dtlamt = ope->amount;
538
539
                guint pos = 0;
539
540
                gboolean insert = FALSE;
540
541
 
552
553
                        guint nbsplit = da_splits_length(ope->splits);
553
554
                        Split *split;
554
555
                        guint i;
555
 
                        
 
556
 
 
557
                                dtlamt = 0.0;
556
558
                                for(i=0;i<nbsplit;i++)
557
559
                                {
558
560
                                        split = da_splits_get(ope->splits, i);
571
573
                                        }
572
574
                                        
573
575
                                        if( pos == active )
574
 
                                        {       insert = TRUE; break; }
 
576
                                        {
 
577
                                                insert = TRUE; 
 
578
                                                dtlamt += split->amount;
 
579
                                                // no more break here as we need to compute split 4 cat
 
580
                                                //break;
 
581
                                        }
575
582
                                }
576
583
                        }
577
584
                        else
600
607
 
601
608
                        gtk_list_store_append (GTK_LIST_STORE(model), &iter);
602
609
                        gtk_list_store_set (GTK_LIST_STORE(model), &iter,
603
 
                                        LST_DSPOPE_DATAS, ope,
 
610
                                        MODEL_TXN_POINTER, ope,
 
611
                                MODEL_TXN_SPLITAMT, dtlamt,
604
612
                                        -1);
605
613
                        }
606
614
 
1182
1190
        row++;
1183
1191
        label = make_label_widget(_("_Range:"));
1184
1192
        gtk_grid_attach (GTK_GRID (table), label, 1, row, 1, 1);
1185
 
        data->CY_range = make_daterange(label, FALSE);
 
1193
        data->CY_range = make_daterange(label, DATE_RANGE_CUSTOM_DISABLE);
1186
1194
        gtk_grid_attach (GTK_GRID (table), data->CY_range, 2, row, 1, 1);
1187
1195
 
1188
1196
        row++;
1453
1461
        repbudget_update_detail(window, NULL);
1454
1462
 
1455
1463
        if( PREFS->date_range_rep != 0)
1456
 
                gtk_combo_box_set_active(GTK_COMBO_BOX(data->CY_range), PREFS->date_range_rep);
 
1464
                hbtk_combo_box_set_active_id(GTK_COMBO_BOX_TEXT(data->CY_range), PREFS->date_range_rep);
1457
1465
        else
1458
1466
                repbudget_compute(window, NULL);
1459
1467