Git commit 2c54e79b95dad6693d963160619a25cb80844e83 by Stephane Mankowski.
Committed on 30/09/2015 at 20:35.
Pushed by smankowski into branch 'master'.
Default categories for payees
BUG:349976
M +1 -0 CHANGELOG
M +7 -0 plugins/import/skrooge_import_csv/skgimportplugincsv.cpp
M +4 -0 plugins/skrooge/skrooge_operation/skgoperation_settings.kcfg
M +8 -0 plugins/skrooge/skrooge_operation/skgoperationpluginwidget.c=
pp
M +1 -0 plugins/skrooge/skrooge_operation/skgoperationpluginwidget.h
M +13 -5 plugins/skrooge/skrooge_operation/skgoperationpluginwidget_p=
ref.ui
M +27 -0 skgbankmodeler/skgdocumentbank.cpp
M +7 -0 skgbankmodeler/skgdocumentbank.h
M +2 -0 tests/skgbankmodelertest/skgtestimportcsv.cpp
http://commits.kde.org/skrooge/2c54e79b95dad6693d963160619a25cb80844e83
diff --git a/CHANGELOG b/CHANGELOG
index a312f20..db5d40a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
skrooge (2.2.0) =
*Correction bug 352674: SQLite version of the system not aligned with em=
bedded in Qt when using sqlcipher =
*Correction bug 349961: Values in "Text" report are clickable to open co=
rresponding operations
+ *Correction bug 349976: Default categories for payees
*Correction: Drag and drop file is now able to move a file
*Correction: The WORD function of "Search & Replace" is no more sensible=
of useless space
=
diff --git a/plugins/import/skrooge_import_csv/skgimportplugincsv.cpp b/plu=
gins/import/skrooge_import_csv/skgimportplugincsv.cpp
index 2226b3c..d4a55ee 100644
--- a/plugins/import/skrooge_import_csv/skgimportplugincsv.cpp
+++ b/plugins/import/skrooge_import_csv/skgimportplugincsv.cpp
@@ -612,6 +612,13 @@ SKGError SKGImportPluginCsv::importFile()
SKGCategoryObject Category;
err =3D SKGCategoryObject::createP=
athCategory(m_importer->getDocument(), val, Category);
IFOKDO(err, currentSubOperation.se=
tCategory(Category))
+
+ IFOK(err && getCSVMapping().indexO=
f("payee") =3D=3D -1) {
+ SKGPayeeObject payeeObj;
+ QString p =3D m_importer->getD=
ocument()->getCategoryForPayee(val);
+ err =3D SKGPayeeObject::create=
Payee(m_importer->getDocument(), p, payeeObj);
+ IFOKDO(err, currentOperation.s=
etPayee(payeeObj))
+ }
}
} else {
// A property
diff --git a/plugins/skrooge/skrooge_operation/skgoperation_settings.kcfg b=
/plugins/skrooge/skrooge_operation/skgoperation_settings.kcfg
index 483f0a3..fdf51b9 100644
--- a/plugins/skrooge/skrooge_operation/skgoperation_settings.kcfg
+++ b/plugins/skrooge/skrooge_operation/skgoperation_settings.kcfg
@@ -25,6 +25,10 @@
true
+
+
+ false
+ =