Merge branch 'master' into dev

This commit is contained in:
Grégory Soutadé 2010-12-15 19:43:16 +01:00
commit 286c9f01dc
2 changed files with 2 additions and 2 deletions

View File

@ -29,7 +29,7 @@
#include <wx/display.h>
#define APP_VERSION "v0.2_dev"
#define APP_VERSION "v0.1"
class wxUI;
class Database;

View File

@ -220,7 +220,7 @@ void GridAccount::LoadOperations(std::vector<Operation>* operations, bool canAdd
{
if (it->parent.Length()) continue;
InsertOperation(user, *it, ++curLine, true, it->month, it->year);
InsertOperation(user, *it, ++curLine, it->fix_cost, it->month, it->year);
}
}