From e477e3a70c13c6ad97c5288363aef1eead30bab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Sat, 29 Jan 2011 12:02:49 +0100 Subject: [PATCH] Grouped operations have bad month/year in SearchPanel --- ChangeLog | 3 ++- src/view/SearchPanel.cpp | 1 + src/view/grid/GridAccount.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a185b3d..62f9967 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,7 @@ v0.2_dev (29/01/2011) ** User ** Better use of sizers (so better interface!) - No further problems with scrollbar in AccountPanel when there is a lot of operations + No further problems with scrollbar in AccountPanel/SearchPanel when there is a lot of operations Better fit of interface when displaying grouped operations ** Dev ** @@ -17,3 +17,4 @@ v0.2_dev (29/01/2011) Unordered accounts (makes account selection points to bad indexes on account graph) Bug in account creation (readonly fields) Bug in search bad computation of month with start_date and end_date + Grouped operations have bad month/year in SearchPanel diff --git a/src/view/SearchPanel.cpp b/src/view/SearchPanel.cpp index 8156832..a64c737 100644 --- a/src/view/SearchPanel.cpp +++ b/src/view/SearchPanel.cpp @@ -116,6 +116,7 @@ SearchPanel::SearchPanel(KissCount* kiss, wxUI *parent) : KissPanel(kiss, parent Fit(); SetMinSize(wxSize(rect.width-rect.x-15, rect.height-rect.y-128-25)); + SetMaxSize(wxSize(rect.width-rect.x-15, rect.height-rect.y-128-25)); SetScrollbars(10, 10, 100/10, 100/10); } diff --git a/src/view/grid/GridAccount.cpp b/src/view/grid/GridAccount.cpp index 832ba9f..575e5c3 100644 --- a/src/view/grid/GridAccount.cpp +++ b/src/view/grid/GridAccount.cpp @@ -664,7 +664,7 @@ void GridAccount::OnOperationModified(wxGridEvent& event) for (i=1, it=op.childs.begin(); it!=op.childs.end(); it++, i++) { op2 = GetOperation(*it); - InsertOperationWithWeek(user, op2, row+i, op2.fix_cost, _curMonth, _curYear); + InsertOperationWithWeek(user, op2, row+i, op2.fix_cost, op2.month, op2.year); } } else