Fix bugs :

* QString::number use scientific format, si it's invalid for numbers > 1 000 000. We need to use v.sprintf("%d");
	* Accounts and categories where badly mapped during import
	* Fix cost not taken in account during import
	* Forbid empty account name and empty category name
This commit is contained in:
2012-05-12 09:56:33 +02:00
parent f1661e315c
commit 669532d385
19 changed files with 89 additions and 34 deletions

View File

@@ -55,7 +55,7 @@ protected:
std::map<int, int> _accounts;
std::map<int, int> _categories;
std::map<AccountAmount, double, AccountAmount> _accountAmounts;
std::map<AccountAmount, int, AccountAmount> _accountAmounts;
};
#endif

View File

@@ -84,7 +84,7 @@ bool XMLExportEngine::SaveAccounts()
bool XMLExportEngine::SaveAccountAmounts()
{
std::map<AccountAmount, double, AccountAmount>::iterator it;
std::map<AccountAmount, int, AccountAmount>::iterator it;
QString v;
for(it=_accountAmounts.begin(); it!=_accountAmounts.end(); it++)
@@ -93,7 +93,7 @@ bool XMLExportEngine::SaveAccountAmounts()
_writer->writeAttribute("account", QString::number(it->first.account));
_writer->writeAttribute("month", QString::number(it->first.month));
_writer->writeAttribute("year", QString::number(it->first.year));
_writer->writeAttribute("amount", v.sprintf("%.2lf", it->second));
_writer->writeAttribute("amount", v.sprintf("%d", it->second));
_writer->writeEndElement();
}
@@ -148,7 +148,7 @@ bool XMLExportEngine::SaveOperations(std::vector<Operation>* operations)
_writer->writeAttribute("day", QString::number(it->day));
_writer->writeAttribute("month", QString::number(it->month));
_writer->writeAttribute("year", QString::number(it->year));
_writer->writeAttribute("amount", QString::number(it->amount));
_writer->writeAttribute("amount", v.sprintf("%d", it->amount));
_writer->writeAttribute("description", it->description);
_writer->writeAttribute("category", QString::number(it->category));
_writer->writeAttribute("fix_cost", (it->fix_cost ? "1" : "0"));