soutade/KissCount
1
0
Fork 0
Code Issues Pull Requests Packages Releases 1 Wiki Activity

Add "transfert" feature (don't show tansferts into statistics)

Browse Source 
Update package.sh
This commit is contained in:
Grégory Soutadé
2010-08-21 09:25:35 +02:00
parent 8977c820fc
commit 3802460429
10 changed files with 172 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/view/AccountPanel.cpp
View File

@@ -458,6 +458,7 @@ void AccountPanel::UpdateStats()
for (it=_curOperations->begin(); it!=_curOperations->end(); it++)
{
if (it->transfert.Length()) continue;
if (it->amount > 0)
{
if (day >= it->day)
@@ -591,7 +592,7 @@ void AccountPanel::OnOperationModified(wxGridEvent& event)
_grid->GetCellValue(event.GetRow(), CATEGORY) == wxT("") &&
_grid->GetCellValue(event.GetRow(), ACCOUNT) == wxT(""))
{
if (_kiss->SearchPreviousOperation(&op_tmp, new_op.description, _curMonth-3, _curYear))
if (_kiss->SearchPreviousOperation(&op_tmp, new_op.description, _curMonth, _curYear))
{
new_op.category = op_tmp.category;
new_op.account = op_tmp.account;
@@ -627,7 +628,6 @@ void AccountPanel::OnOperationModified(wxGridEvent& event)
}
}
// Penser au fix implosif
// Modify a fix operation
if (row < _fixCosts)
{
@@ -646,16 +646,22 @@ void AccountPanel::OnOperationModified(wxGridEvent& event)
new_op.id = cur_op.id;
new_op.fix_cost = true;
new_op.transfert = cur_op.transfert;
if (cur_op.day != new_op.day)
{
need_insertion = true;
_grid->DeleteRows(event.GetRow(), 1);
_curOperations->erase(_curOperations->begin()+row);
_fixCosts--;
_kiss->UpdateOperation(new_op);
}
else
(*_curOperations)[row] = new_op;
_kiss->UpdateOperation(new_op);
{
_kiss->UpdateOperation(new_op);
(*_curOperations)[row] = new_op;
}
fix_op = true;
}
// Add a fixCost
@@ -683,6 +689,7 @@ void AccountPanel::OnOperationModified(wxGridEvent& event)
cur_op = (*_curOperations)[row] ;
new_op.id = cur_op.id;
new_op.fix_cost = false;
new_op.transfert = cur_op.transfert;
if (col == DELETE)
{
@@ -699,10 +706,13 @@ void AccountPanel::OnOperationModified(wxGridEvent& event)
need_insertion = true;
_grid->DeleteRows(event.GetRow(), 1);
_curOperations->erase(_curOperations->begin()+row);
_kiss->UpdateOperation(new_op);
}
else
(*_curOperations)[row] = new_op;
_kiss->UpdateOperation(new_op);
{
_kiss->UpdateOperation(new_op);
(*_curOperations)[row] = new_op;
}
}
// Add an operation
else
@@ -733,6 +743,7 @@ void AccountPanel::OnOperationModified(wxGridEvent& event)
{
if ((*_curOperations)[i].day > new_op.day)
break;
}
else
{

1
src/view/SearchPanel.cpp
View File

@@ -356,6 +356,7 @@ void SearchPanel::OnOperationModified(wxGridEvent& event)
cur_op = (*_operations)[row] ;
new_op.id = cur_op.id;
new_op.fix_cost = false;
new_op.transfert = cur_op.transfert;
if (col == DELETE)
{