diff --git a/config-kmymoney.h.cmake b/config-kmymoney.h.cmake index 2386f7a10..0e9d88568 100644 --- a/config-kmymoney.h.cmake +++ b/config-kmymoney.h.cmake @@ -1,25 +1,28 @@ /* config-kmymoney.h. Generated from config-kmymoney.h.cmake by cmake */ /* Name of package */ #define PACKAGE "kmymoney" /* Define to the full name of this package. */ #define PACKAGE_NAME "KMyMoney" /* Define to 1 if you have the header file. */ #cmakedefine HAVE_STDINT_H 1 /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_TYPES_H 1 /* Define to 1 if you have the header file. */ #cmakedefine HAVE_UNISTD_H 1 /* The size of `long', as computed by sizeof. */ #cmakedefine SIZEOF_LONG @SIZEOF_LONG@ #cmakedefine KMM_DEBUG 1 #cmakedefine KMM_DESIGNER 1 #cmakedefine HAVE_KDEPIMLIBS 1 + +/* for KF5 compatibility */ +#define QStringLiteral QLatin1String diff --git a/kmymoney/plugins/ofx/import/dialogs/konlinebankingstatus.cpp b/kmymoney/plugins/ofx/import/dialogs/konlinebankingstatus.cpp index 0561afe0a..2ddb370d9 100644 --- a/kmymoney/plugins/ofx/import/dialogs/konlinebankingstatus.cpp +++ b/kmymoney/plugins/ofx/import/dialogs/konlinebankingstatus.cpp @@ -1,149 +1,155 @@ /*************************************************************************** konlinebankingstatus.cpp ------------------- begin : Wed Apr 16 2008 copyright : (C) 2008 by Thomas Baumgart email : ipwizard@users.sourceforge.net ***************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #include "konlinebankingstatus.h" // ---------------------------------------------------------------------------- // System Includes // ---------------------------------------------------------------------------- // QT Includes #include #include #include #include #include // ---------------------------------------------------------------------------- // KDE Includes #include #include #include #include // ---------------------------------------------------------------------------- // Project Includes #include #include #include #include "mymoneyofxconnector.h" using KWallet::Wallet; KOnlineBankingStatus::KOnlineBankingStatus(const MyMoneyAccount& acc, QWidget *parent) : KOnlineBankingStatusDecl(parent), m_appId(0) { m_ledOnlineStatus->off(); m_preferredPayee->setCurrentIndex(0); buttonGroupBox2->setContentsMargins(0, 0, 0, 0); buttonGroup2->setId(m_todayRB, 0); buttonGroup2->setId(m_lastUpdateRB, 1); buttonGroup2->setId(m_pickDateRB, 2); // Set up online banking settings if applicable MyMoneyKeyValueContainer settings = acc.onlineBankingSettings(); m_textOnlineStatus->setText(i18n("Enabled & configured")); m_ledOnlineStatus->on(); QString account = settings.value("accountid"); QString bank = settings.value("bankname"); QString bankid = QString("%1 %2").arg(settings.value("bankid")).arg(settings.value("branchid")); if (bankid.length() > 1) bank += QString(" (%1)").arg(bankid); m_textBank->setText(bank); m_textOnlineAccount->setText(account); m_appId = new OfxAppVersion(m_applicationCombo, m_applicationEdit, settings.value("appId")); m_headerVersion = new OfxHeaderVersion(m_headerVersionCombo, settings.value("kmmofx-headerVersion")); m_clientUidEdit->setText(settings.value("clientUid")); #ifndef LIBOFX_HAVE_CLIENTUID // in case the installed libofx does not support clientuid // we disable the widget m_clientUidEdit->setEnabled(false); m_clientUidLabel->setEnabled(false); #endif connect(m_applicationCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(applicationSelectionChanged())); m_headerVersionEdit->hide(); int numDays = 60; QString snumDays = settings.value("kmmofx-numRequestDays"); if (!snumDays.isEmpty()) numDays = snumDays.toInt(); m_numdaysSpin->setValue(numDays); m_todayRB->setChecked(settings.value("kmmofx-todayMinus").isEmpty() || settings.value("kmmofx-todayMinus").toInt() != 0); m_lastUpdateRB->setChecked(!settings.value("kmmofx-lastUpdate").isEmpty() && settings.value("kmmofx-lastUpdate").toInt() != 0); m_lastUpdateTXT->setText(acc.value("lastImportedTransactionDate")); m_pickDateRB->setChecked(!settings.value("kmmofx-pickDate").isEmpty() && settings.value("kmmofx-pickDate").toInt() != 0); QString specificDate = settings.value("kmmofx-specificDate"); if (!specificDate.isEmpty()) m_specificDate->setDate(QDate::fromString(specificDate)); else m_specificDate->setDate(QDate::currentDate()); m_specificDate->setMaximumDate(QDate::currentDate()); m_preferredPayee->setCurrentIndex(settings.value("kmmofx-preferName").toInt()); + const int offset = settings.value("kmmofx-timestampOffset").toInt(); + m_timestampOffsetSign->setCurrentIndex(offset < 0 ? 1 : 0); + QTime time; + time.setHMS(qAbs(offset) / 60, qAbs(offset) % 60,0); + m_timestampOffset->setTime(time); + QString key = OFX_PASSWORD_KEY(settings.value("url"), settings.value("uniqueId")); QString pwd; // if we don't find a password in the wallet, we use the old method // and retrieve it from the settings stored in the KMyMoney data storage. if (Wallet::keyDoesNotExist(Wallet::NetworkWallet(), Wallet::PasswordFolder(), key)) { pwd = settings.value("password"); } else { Wallet *wallet = openSynchronousWallet(); if (wallet) { wallet->setFolder(Wallet::PasswordFolder()); wallet->readPassword(key, pwd); } } m_password->setText(pwd); m_storePassword->setChecked(!pwd.isEmpty()); } KOnlineBankingStatus::~KOnlineBankingStatus() { delete m_headerVersion; delete m_appId; } void KOnlineBankingStatus::applicationSelectionChanged() { m_applicationEdit->setVisible(m_appId->appId().endsWith(':')); } const QString KOnlineBankingStatus::appId() const { if (m_appId) return m_appId->appId(); return QString(); } QString KOnlineBankingStatus::headerVersion() const { if (m_headerVersion) return m_headerVersion->headerVersion(); return QString(); } diff --git a/kmymoney/plugins/ofx/import/dialogs/konlinebankingstatusdecl.ui b/kmymoney/plugins/ofx/import/dialogs/konlinebankingstatusdecl.ui index 1caba565f..d0318f778 100644 --- a/kmymoney/plugins/ofx/import/dialogs/konlinebankingstatusdecl.ui +++ b/kmymoney/plugins/ofx/import/dialogs/konlinebankingstatusdecl.ui @@ -1,528 +1,565 @@ KOnlineBankingStatusDecl 0 0 634 338 0 Account Details STATUS: false KLed::Off 10 0 Unavailable false Qt::Horizontal QSizePolicy::Expanding 41 21 BANK/BROKER: false 0 0 75 true &lt;Not configured&gt; false ACCOUNT: false 0 0 75 true &lt;Not configured&gt; false Store password false true true Qt::Vertical 20 143 OFX Details Header Version false Qt::Horizontal QSizePolicy::Expanding 150 21 Identify as false OFX <CLIENTUID> for institutions that require it Client UID Qt::Vertical 20 195 Import Details Start date of import QFrame::NoFrame QFrame::Plain 0 QLayout::SetMinimumSize Last &update buttonGroup2 false To&day minus true buttonGroup2 180 days false Pi&ck date buttonGroup2 false Qt::Horizontal 214 20 1 0 Payee's name is based on contents of the OFX tag false PAYEEID NAME MEMO + + + + <html><head/><body><p>In case the server is located in a different timezone than your local time, then the post date of imported transactions is off by a day.</p><p>This setting can be used to adjust the timestamps of the transactions during import to reflect your local time. It does not affect previously imported transactions. </p><p>If you are located west of your bank's server than enter a negative time, in case you are located east of it enter a positve time.</p><p>If you are not sure, leave this setting at 0:00.</p></body></html> + + + + + + + + Timezone offset + + + + + + + + + + + + + + - + + + + + + + + + + + + Qt::Vertical 20 0 KComboBox QComboBox
kcombobox.h
 KLineEdit QLineEdit
klineedit.h
 KLed QWidget
kled.h
 KTabWidget QTabWidget
ktabwidget.h
1 kMyMoneyDateInput QFrame
kmymoneydateinput.h
1 m_pickDateRB toggled(bool) m_specificDate setEnabled(bool) 91 318 202 314 m_todayRB toggled(bool) m_numdaysSpin setEnabled(bool) 91 280 268 275 m_storePassword toggled(bool) m_password setEnabled(bool) 158 289 263 289 diff --git a/kmymoney/plugins/ofx/import/ofximporterplugin.cpp b/kmymoney/plugins/ofx/import/ofximporterplugin.cpp index 1c4122096..ab5473884 100644 --- a/kmymoney/plugins/ofx/import/ofximporterplugin.cpp +++ b/kmymoney/plugins/ofx/import/ofximporterplugin.cpp @@ -1,844 +1,856 @@ /*************************************************************************** ofximporterplugin.cpp ------------------- begin : Sat Jan 01 2005 copyright : (C) 2005 by Ace Jones email : Ace Jones ***************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #include "ofximporterplugin.h" // ---------------------------------------------------------------------------- // QT Includes #include #include #include #include #include // ---------------------------------------------------------------------------- // KDE Includes #include #include #include #include #include #include #include #include // ---------------------------------------------------------------------------- // Project Includes #include "konlinebankingstatus.h" #include "konlinebankingsetupwizard.h" #include "kofxdirectconnectdlg.h" #include "ui_importoption.h" //#define DEBUG_LIBOFX K_PLUGIN_FACTORY(OfxImportFactory, registerPlugin();) K_EXPORT_PLUGIN(OfxImportFactory("kmm_ofximport")) using KWallet::Wallet; class OfxImporterPlugin::Private { public: Private() : m_valid(false), m_preferName(PreferId), m_walletIsOpen(false), m_statusDlg(0), m_wallet(0), - m_updateStartDate(QDate(1900,1,1)) {} + m_updateStartDate(QDate(1900,1,1)), m_timestampOffset(0) {} bool m_valid; enum NamePreference { PreferId = 0, PreferName, PreferMemo } m_preferName; bool m_walletIsOpen; QList m_statementlist; QList m_securitylist; QString m_fatalerror; QStringList m_infos; QStringList m_warnings; QStringList m_errors; KOnlineBankingStatus* m_statusDlg; Wallet *m_wallet; QDate m_updateStartDate; + int m_timestampOffset; }; OfxImporterPlugin::OfxImporterPlugin(QObject *parent, const QVariantList&) : KMyMoneyPlugin::Plugin(parent, "KMyMoney OFX"), /* * the string in the line above must be the same as * X-KDE-PluginInfo-Name and the provider name assigned in * OfxImporterPlugin::onlineBankingSettings() */ KMyMoneyPlugin::ImporterPlugin(), d(new Private) { setComponentData(OfxImportFactory::componentData()); setXMLFile("kmm_ofximport.rc"); createActions(); // For ease announce that we have been loaded. qDebug("KMyMoney ofximport plugin loaded"); } OfxImporterPlugin::~OfxImporterPlugin() { delete d; } void OfxImporterPlugin::createActions() { KAction *action = actionCollection()->addAction("file_import_ofx"); action->setText(i18n("OFX...")); connect(action, SIGNAL(triggered(bool)), this, SLOT(slotImportFile())); } void OfxImporterPlugin::slotImportFile() { QWidget * widget = new QWidget; Ui_ImportOption* option = new Ui_ImportOption; option->setupUi(widget); KUrl url = importInterface()->selectFile(i18n("OFX import file selection"), "", "*.ofx *.qfx *.ofc|OFX files (*.ofx, *.qfx, *.ofc)\n*|All files", static_cast((int)(KFile::File | KFile::ExistingOnly)), widget); d->m_preferName = static_cast(option->m_preferName->currentIndex()); if (url.isValid()) { if (isMyFormat(url.path())) { slotImportFile(url.path()); } else { KMessageBox::error(0, i18n("Unable to import %1 using the OFX importer plugin. This file is not the correct format.", url.prettyUrl()), i18n("Incorrect format")); } } delete widget; } QString OfxImporterPlugin::formatName() const { return "OFX"; } QString OfxImporterPlugin::formatFilenameFilter() const { return "*.ofx *.qfx *.ofc"; } bool OfxImporterPlugin::isMyFormat(const QString& filename) const { // filename is considered an Ofx file if it contains // the tag "" or "" in the first 20 lines. // which contain some data bool result = false; QFile f(filename); if (f.open(QIODevice::ReadOnly | QIODevice::Text)) { QTextStream ts(&f); int lineCount = 20; while (!ts.atEnd() && !result && lineCount != 0) { // get a line of data and remove all unnecessary whitepace chars QString line = ts.readLine().simplified(); if (line.contains("", Qt::CaseInsensitive) || line.contains("", Qt::CaseInsensitive)) result = true; // count only lines that contain some non white space chars if (!line.isEmpty()) lineCount--; } f.close(); } return result; } bool OfxImporterPlugin::import(const QString& filename) { d->m_fatalerror = i18n("Unable to parse file"); d->m_valid = false; d->m_errors.clear(); d->m_warnings.clear(); d->m_infos.clear(); d->m_statementlist.clear(); d->m_securitylist.clear(); QByteArray filename_deep = QFile::encodeName(filename); ofx_STATUS_msg = true; ofx_INFO_msg = true; ofx_WARNING_msg = true; ofx_ERROR_msg = true; #ifdef DEBUG_LIBOFX ofx_PARSER_msg = true; ofx_DEBUG_msg = true; ofx_DEBUG1_msg = true; ofx_DEBUG2_msg = true; ofx_DEBUG3_msg = true; ofx_DEBUG4_msg = true; ofx_DEBUG5_msg = true; #endif LibofxContextPtr ctx = libofx_get_new_context(); Q_CHECK_PTR(ctx); qDebug("setup callback routines"); ofx_set_transaction_cb(ctx, ofxTransactionCallback, this); ofx_set_statement_cb(ctx, ofxStatementCallback, this); ofx_set_account_cb(ctx, ofxAccountCallback, this); ofx_set_security_cb(ctx, ofxSecurityCallback, this); ofx_set_status_cb(ctx, ofxStatusCallback, this); qDebug("process data"); libofx_proc_file(ctx, filename_deep, AUTODETECT); libofx_free_context(ctx); if (d->m_valid) { d->m_fatalerror.clear(); d->m_valid = storeStatements(d->m_statementlist); } return d->m_valid; } QString OfxImporterPlugin::lastError() const { if (d->m_errors.count() == 0) return d->m_fatalerror; return d->m_errors.join("

"); } /* __________________________________________________________________________ * AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA * * Static callbacks for LibOFX * * YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY */ int OfxImporterPlugin::ofxTransactionCallback(struct OfxTransactionData data, void * pv) { // kDebug(2) << Q_FUNC_INFO; OfxImporterPlugin* pofx = reinterpret_cast(pv); MyMoneyStatement& s = pofx->back(); MyMoneyStatement::Transaction t; if (data.date_posted_valid) { QDateTime dt; - dt.setTime_t(data.date_posted); + dt.setTime_t(data.date_posted - pofx->d->m_timestampOffset * 60); t.m_datePosted = dt.date(); } else if (data.date_initiated_valid) { QDateTime dt; - dt.setTime_t(data.date_initiated); + dt.setTime_t(data.date_initiated - pofx->d->m_timestampOffset * 60); t.m_datePosted = dt.date(); } if (t.m_datePosted.isValid()) { // verify the transaction date is one we want if (t.m_datePosted < pofx->d->m_updateStartDate) { //kDebug(0) << "discarding transaction dated" << qPrintable(t.m_datePosted.toString(Qt::ISODate)); return 0; } } if (data.amount_valid) { t.m_amount = MyMoneyMoney(data.amount, 1000); } if (data.check_number_valid) { t.m_strNumber = QString::fromUtf8(data.check_number); } if (data.fi_id_valid) { t.m_strBankID = QString("ID ") + QString::fromUtf8(data.fi_id); } else if (data.reference_number_valid) { t.m_strBankID = QString("REF ") + QString::fromUtf8(data.reference_number); } // Decide whether to use NAME, PAYEEID or MEMO to construct the payee bool validity[3] = {false, false, false}; QStringList values; switch (pofx->d->m_preferName) { case OfxImporterPlugin::Private::PreferId: // PAYEEID default: validity[0] = data.payee_id_valid; validity[1] = data.name_valid; validity[2] = data.memo_valid; values += QString::fromUtf8(data.payee_id); values += QString::fromUtf8(data.name); values += QString::fromUtf8(data.memo); break; case OfxImporterPlugin::Private::PreferName: // NAME validity[0] = data.name_valid; validity[1] = data.payee_id_valid; validity[2] = data.memo_valid; values += QString::fromUtf8(data.name); values += QString::fromUtf8(data.payee_id); values += QString::fromUtf8(data.memo); break; case OfxImporterPlugin::Private::PreferMemo: // MEMO validity[0] = data.memo_valid; validity[1] = data.payee_id_valid; validity[2] = data.name_valid; values += QString::fromUtf8(data.memo); values += QString::fromUtf8(data.payee_id); values += QString::fromUtf8(data.name); break; } for (int idx = 0; idx < 3; ++idx) { if (validity[idx]) { t.m_strPayee = values[idx]; break; } } // extract memo field if we haven't used it as payee if ((data.memo_valid) && (pofx->d->m_preferName != OfxImporterPlugin::Private::PreferMemo)) { t.m_strMemo = QString::fromUtf8(data.memo); } // If the payee or memo fields are blank, set them to // the other one which is NOT blank. (acejones) if (t.m_strPayee.isEmpty()) { // But we only create a payee for non-investment transactions (ipwizard) if (! t.m_strMemo.isEmpty() && data.invtransactiontype_valid == false) t.m_strPayee = t.m_strMemo; } else { if (t.m_strMemo.isEmpty()) t.m_strMemo = t.m_strPayee; } if (data.security_data_valid) { struct OfxSecurityData* secdata = data.security_data_ptr; if (secdata->ticker_valid) { t.m_strSymbol = QString::fromUtf8(secdata->ticker); } if (secdata->secname_valid) { t.m_strSecurity = QString::fromUtf8(secdata->secname); } } t.m_shares = MyMoneyMoney(); if (data.units_valid) { t.m_shares = MyMoneyMoney(data.units, 100000).reduce(); } t.m_price = MyMoneyMoney(); if (data.unitprice_valid) { t.m_price = MyMoneyMoney(data.unitprice, 100000).reduce(); } t.m_fees = MyMoneyMoney(); if (data.fees_valid) { t.m_fees += MyMoneyMoney(data.fees, 1000).reduce(); } if (data.commission_valid) { t.m_fees += MyMoneyMoney(data.commission, 1000).reduce(); } bool unhandledtype = false; QString type; if (data.invtransactiontype_valid) { switch (data.invtransactiontype) { case OFX_BUYDEBT: case OFX_BUYMF: case OFX_BUYOPT: case OFX_BUYOTHER: case OFX_BUYSTOCK: t.m_eAction = MyMoneyStatement::Transaction::eaBuy; break; case OFX_REINVEST: t.m_eAction = MyMoneyStatement::Transaction::eaReinvestDividend; break; case OFX_SELLDEBT: case OFX_SELLMF: case OFX_SELLOPT: case OFX_SELLOTHER: case OFX_SELLSTOCK: t.m_eAction = MyMoneyStatement::Transaction::eaSell; break; case OFX_INCOME: t.m_eAction = MyMoneyStatement::Transaction::eaCashDividend; // NOTE: With CashDividend, the amount of the dividend should // be in data.amount. Since I've never seen an OFX file with // cash dividends, this is an assumption on my part. (acejones) break; // // These types are all not handled. We will generate a warning for them. // case OFX_CLOSUREOPT: unhandledtype = true; type = "CLOSUREOPT (Close a position for an option)"; break; case OFX_INVEXPENSE: unhandledtype = true; type = "INVEXPENSE (Misc investment expense that is associated with a specific security)"; break; case OFX_JRNLFUND: unhandledtype = true; type = "JRNLFUND (Journaling cash holdings between subaccounts within the same investment account)"; break; case OFX_MARGININTEREST: unhandledtype = true; type = "MARGININTEREST (Margin interest expense)"; break; case OFX_RETOFCAP: unhandledtype = true; type = "RETOFCAP (Return of capital)"; break; case OFX_SPLIT: unhandledtype = true; type = "SPLIT (Stock or mutial fund split)"; break; case OFX_TRANSFER: unhandledtype = true; type = "TRANSFER (Transfer holdings in and out of the investment account)"; break; default: unhandledtype = true; type = QString("UNKNOWN %1").arg(data.invtransactiontype); break; } } else t.m_eAction = MyMoneyStatement::Transaction::eaNone; // In the case of investment transactions, the 'total' is supposed to the total amount // of the transaction. units * unitprice +/- commission. Easy, right? Sadly, it seems // some ofx creators do not follow this in all circumstances. Therefore, we have to double- // check the total here and adjust it if it's wrong. #if 0 // Even more sadly, this logic is BROKEN. It consistently results in bogus total // values, because of rounding errors in the price. A more through solution would // be to test if the comission alone is causing a discrepency, and adjust in that case. if (data.invtransactiontype_valid && data.unitprice_valid) { double proper_total = t.m_dShares * data.unitprice + t.m_moneyFees; if (proper_total != t.m_moneyAmount) { pofx->addWarning(QString("Transaction %1 has an incorrect total of %2. Using calculated total of %3 instead.").arg(t.m_strBankID).arg(t.m_moneyAmount).arg(proper_total)); t.m_moneyAmount = proper_total; } } #endif if (unhandledtype) pofx->addWarning(QString("Transaction %1 has an unsupported type (%2).").arg(t.m_strBankID, type)); else s.m_listTransactions += t; // kDebug(2) << Q_FUNC_INFO << "return 0 "; return 0; } int OfxImporterPlugin::ofxStatementCallback(struct OfxStatementData data, void* pv) { // kDebug(2) << Q_FUNC_INFO; OfxImporterPlugin* pofx = reinterpret_cast(pv); MyMoneyStatement& s = pofx->back(); pofx->setValid(); if (data.currency_valid) { s.m_strCurrency = QString::fromUtf8(data.currency); } if (data.account_id_valid) { s.m_strAccountNumber = QString::fromUtf8(data.account_id); } if (data.date_start_valid) { QDateTime dt; - dt.setTime_t(data.date_start); + dt.setTime_t(data.date_start - pofx->d->m_timestampOffset * 60); s.m_dateBegin = dt.date(); } if (data.date_end_valid) { QDateTime dt; - dt.setTime_t(data.date_end); + dt.setTime_t(data.date_end - pofx->d->m_timestampOffset * 60); s.m_dateEnd = dt.date(); } if (data.ledger_balance_valid && data.ledger_balance_date_valid) { s.m_closingBalance = MyMoneyMoney(data.ledger_balance); QDateTime dt; dt.setTime_t(data.ledger_balance_date); s.m_dateEnd = dt.date(); } // kDebug(2) << Q_FUNC_INFO << " return 0"; return 0; } int OfxImporterPlugin::ofxAccountCallback(struct OfxAccountData data, void * pv) { // kDebug(2) << Q_FUNC_INFO; OfxImporterPlugin* pofx = reinterpret_cast(pv); pofx->addnew(); MyMoneyStatement& s = pofx->back(); // Having any account at all makes an ofx statement valid pofx->d->m_valid = true; if (data.account_id_valid) { s.m_strAccountName = QString::fromUtf8(data.account_name); s.m_strAccountNumber = QString::fromUtf8(data.account_id); } if (data.bank_id_valid) { s.m_strRoutingNumber = QString::fromUtf8(data.bank_id); } if (data.broker_id_valid) { s.m_strRoutingNumber = QString::fromUtf8(data.broker_id); } if (data.currency_valid) { s.m_strCurrency = QString::fromUtf8(data.currency); } if (data.account_type_valid) { switch (data.account_type) { case OfxAccountData::OFX_CHECKING : s.m_eType = MyMoneyStatement::etCheckings; break; case OfxAccountData::OFX_SAVINGS : s.m_eType = MyMoneyStatement::etSavings; break; case OfxAccountData::OFX_MONEYMRKT : s.m_eType = MyMoneyStatement::etInvestment; break; case OfxAccountData::OFX_CREDITLINE : s.m_eType = MyMoneyStatement::etCreditCard; break; case OfxAccountData::OFX_CMA : s.m_eType = MyMoneyStatement::etCreditCard; break; case OfxAccountData::OFX_CREDITCARD : s.m_eType = MyMoneyStatement::etCreditCard; break; case OfxAccountData::OFX_INVESTMENT : s.m_eType = MyMoneyStatement::etInvestment; break; } } // ask KMyMoney for an account id s.m_accountId = pofx->account("kmmofx-acc-ref", QString("%1-%2").arg(s.m_strRoutingNumber, s.m_strAccountNumber)).id(); // copy over the securities s.m_listSecurities = pofx->d->m_securitylist; // kDebug(2) << Q_FUNC_INFO << " return 0"; return 0; } int OfxImporterPlugin::ofxSecurityCallback(struct OfxSecurityData data, void* pv) { // kDebug(2) << Q_FUNC_INFO; OfxImporterPlugin* pofx = reinterpret_cast(pv); MyMoneyStatement::Security sec; if (data.unique_id_valid) { sec.m_strId = QString::fromUtf8(data.unique_id); } if (data.secname_valid) { sec.m_strName = QString::fromUtf8(data.secname); } if (data.ticker_valid) { sec.m_strSymbol = QString::fromUtf8(data.ticker); } pofx->d->m_securitylist += sec; return 0; } int OfxImporterPlugin::ofxStatusCallback(struct OfxStatusData data, void * pv) { // kDebug(2) << Q_FUNC_INFO; OfxImporterPlugin* pofx = reinterpret_cast(pv); QString message; // if we got this far, we know we were able to parse the file. // so if it fails after here it can only because there were no actual // accounts in the file! pofx->d->m_fatalerror = i18n("No accounts found."); if (data.ofx_element_name_valid) message.prepend(QString("%1: ").arg(QString::fromUtf8(data.ofx_element_name))); if (data.code_valid) message += QString("%1 (Code %2): %3").arg(QString::fromUtf8(data.name)).arg(data.code).arg(QString::fromUtf8(data.description)); if (data.server_message_valid) message += QString(" (%1)").arg(QString::fromUtf8(data.server_message)); if (data.severity_valid) { switch (data.severity) { case OfxStatusData::INFO: pofx->addInfo(message); break; case OfxStatusData::ERROR: pofx->addError(message); break; case OfxStatusData::WARN: pofx->addWarning(message); break; default: pofx->addWarning(message); pofx->addWarning("Previous message was an unknown type. 'WARNING' was assumed."); break; } } // kDebug(2) << Q_FUNC_INFO << " return 0 "; return 0; } bool OfxImporterPlugin::importStatement(const MyMoneyStatement& s) { qDebug("OfxImporterPlugin::importStatement start"); return statementInterface()->import(s); } const MyMoneyAccount& OfxImporterPlugin::account(const QString& key, const QString& value) const { return statementInterface()->account(key, value); } void OfxImporterPlugin::protocols(QStringList& protocolList) const { protocolList.clear(); protocolList << "OFX"; } QWidget* OfxImporterPlugin::accountConfigTab(const MyMoneyAccount& acc, QString& name) { name = i18n("Online settings"); d->m_statusDlg = new KOnlineBankingStatus(acc, 0); return d->m_statusDlg; } MyMoneyKeyValueContainer OfxImporterPlugin::onlineBankingSettings(const MyMoneyKeyValueContainer& current) { MyMoneyKeyValueContainer kvp(current); // keep the provider name in sync with the one found in kmm_ofximport.desktop kvp["provider"] = "KMyMoney OFX"; if (d->m_statusDlg) { kvp.deletePair("appId"); kvp.deletePair("kmmofx-headerVersion"); kvp.deletePair("password"); d->m_wallet = openSynchronousWallet(); if (d->m_wallet && (d->m_wallet->hasFolder(KWallet::Wallet::PasswordFolder()) || d->m_wallet->createFolder(KWallet::Wallet::PasswordFolder())) && d->m_wallet->setFolder(KWallet::Wallet::PasswordFolder())) { QString key = OFX_PASSWORD_KEY(kvp.value("url"), kvp.value("uniqueId")); if (d->m_statusDlg->m_storePassword->isChecked()) { d->m_wallet->writePassword(key, d->m_statusDlg->m_password->text()); } else { if (d->m_wallet->hasEntry(key)) { d->m_wallet->removeEntry(key); } } } else { if (d->m_statusDlg->m_storePassword->isChecked()) { kvp.setValue("password", d->m_statusDlg->m_password->text()); } } if (!d->m_statusDlg->appId().isEmpty()) kvp.setValue("appId", d->m_statusDlg->appId()); kvp.setValue("kmmofx-headerVersion", d->m_statusDlg->headerVersion()); kvp.setValue("kmmofx-numRequestDays", QString::number(d->m_statusDlg->m_numdaysSpin->value())); kvp.setValue("kmmofx-todayMinus", QString::number(d->m_statusDlg->m_todayRB->isChecked())); kvp.setValue("kmmofx-lastUpdate", QString::number(d->m_statusDlg->m_lastUpdateRB->isChecked())); kvp.setValue("kmmofx-pickDate", QString::number(d->m_statusDlg->m_pickDateRB->isChecked())); kvp.setValue("kmmofx-specificDate", d->m_statusDlg->m_specificDate->date().toString()); kvp.setValue("kmmofx-preferName", QString::number(d->m_statusDlg->m_preferredPayee->currentIndex())); if (!d->m_statusDlg->m_clientUidEdit->text().isEmpty()) kvp.setValue("clientUid", d->m_statusDlg->m_clientUidEdit->text()); else kvp.deletePair("clientUid"); + if (d->m_statusDlg->m_timestampOffset->time().msecsTo(QTime()) == 0) { + kvp.deletePair(QStringLiteral("kmmofx-timestampOffset")); + } else { + // get offset in minutes + int offset = d->m_statusDlg->m_timestampOffset->time().msecsTo(QTime()) / 1000 / 60; + if (d->m_statusDlg->m_timestampOffsetSign->currentText() == QStringLiteral("-")) { + offset = -offset; + } + kvp.setValue(QStringLiteral("kmmofx-timestampOffset"), QString::number(offset)); + } // TODO get rid of pre 4.6 values // kvp.deletePair("kmmofx-preferPayeeid"); } return kvp; } bool OfxImporterPlugin::mapAccount(const MyMoneyAccount& acc, MyMoneyKeyValueContainer& settings) { Q_UNUSED(acc); bool rc = false; QPointer wiz = new KOnlineBankingSetupWizard(0); if (wiz->isInit()) { if (wiz->exec() == QDialog::Accepted) { rc = wiz->chosenSettings(settings); } } delete wiz; return rc; } bool OfxImporterPlugin::updateAccount(const MyMoneyAccount& acc, bool moreAccounts) { Q_UNUSED(moreAccounts); qDebug("OfxImporterPlugin::updateAccount"); try { if (!acc.id().isEmpty()) { // Save the value of preferName to be used by ofxTransactionCallback d->m_preferName = static_cast(acc.onlineBankingSettings().value("kmmofx-preferName").toInt()); QPointer dlg = new KOfxDirectConnectDlg(acc); connect(dlg, SIGNAL(statementReady(QString)), this, SLOT(slotImportFile(QString))); // get the the date of the earliest transaction that we are interested in // from the settings for this account MyMoneyKeyValueContainer settings = acc.onlineBankingSettings(); if (!settings.value("provider").isEmpty()) { if ((settings.value("kmmofx-todayMinus").toInt() != 0) && !settings.value("kmmofx-numRequestDays").isEmpty()) { //kDebug(0) << "start date = today minus"; d->m_updateStartDate = QDate::currentDate().addDays(-settings.value("kmmofx-numRequestDays").toInt()); } else if ((settings.value("kmmofx-lastUpdate").toInt() != 0) && !acc.value("lastImportedTransactionDate").isEmpty()) { //kDebug(0) << "start date = last update"; d->m_updateStartDate = QDate::fromString(acc.value("lastImportedTransactionDate"), Qt::ISODate); } else if ((settings.value("kmmofx-pickDate").toInt() != 0) && !settings.value("kmmofx-specificDate").isEmpty()) { //kDebug(0) << "start date = pick date"; d->m_updateStartDate = QDate::fromString(settings.value("kmmofx-specificDate")); } else { //kDebug(0) << "start date = today - 2 months"; d->m_updateStartDate = QDate::currentDate().addMonths(-2); } } + d->m_timestampOffset = settings.value("kmmofx-timestampOffset").toInt(); //kDebug(0) << "ofx plugin: account" << acc.name() << "earliest transaction date to process =" << qPrintable(d->m_updateStartDate.toString(Qt::ISODate)); if (dlg->init()) dlg->exec(); delete dlg; // reset the earliest-interesting-transaction date to the non-specific account setting d->m_updateStartDate = QDate(1900,1,1); - + d->m_timestampOffset = 0; } } catch (const MyMoneyException &e) { KMessageBox::information(0 , i18n("Error connecting to bank: %1", e.what())); } return false; } void OfxImporterPlugin::slotImportFile(const QString& url) { qDebug("OfxImporterPlugin::slotImportFile"); if (!import(url)) { KMessageBox::error(0, QString("%1").arg(i18n("

Unable to import '%1' using the OFX importer plugin. The plugin returned the following error:

%2

", url, lastError())), i18n("Importing error")); } } bool OfxImporterPlugin::storeStatements(QList& statements) { bool hasstatements = (statements.count() > 0); bool ok = true; bool abort = false; // FIXME Deal with warnings/errors coming back from plugins /*if ( ofx.errors().count() ) { if ( KMessageBox::warningContinueCancelList(this,i18n("The following errors were returned from your bank"),ofx.errors(),i18n("OFX Errors")) == KMessageBox::Cancel ) abort = true; } if ( ofx.warnings().count() ) { if ( KMessageBox::warningContinueCancelList(this,i18n("The following warnings were returned from your bank"),ofx.warnings(),i18n("OFX Warnings"),KStandardGuiItem::cont(),"ofxwarnings") == KMessageBox::Cancel ) abort = true; }*/ qDebug("OfxImporterPlugin::storeStatements() with %d statements called", static_cast(statements.count())); QList::const_iterator it_s = statements.constBegin(); while (it_s != statements.constEnd() && !abort) { ok = ok && importStatement((*it_s)); ++it_s; } if (hasstatements && !ok) { KMessageBox::error(0, i18n("Importing process terminated unexpectedly."), i18n("Failed to import all statements.")); } return (!hasstatements || ok); } void OfxImporterPlugin::addnew() { d->m_statementlist.push_back(MyMoneyStatement()); } MyMoneyStatement& OfxImporterPlugin::back() { return d->m_statementlist.back(); } bool OfxImporterPlugin::isValid() const { return d->m_valid; } void OfxImporterPlugin::setValid() { d->m_valid = true; } void OfxImporterPlugin::addInfo(const QString& _msg) { d->m_infos += _msg; } void OfxImporterPlugin::addWarning(const QString& _msg) { d->m_warnings += _msg; } void OfxImporterPlugin::addError(const QString& _msg) { d->m_errors += _msg; } const QStringList& OfxImporterPlugin::infos() const // krazy:exclude=spelling { return d->m_infos; } const QStringList& OfxImporterPlugin::warnings() const { return d->m_warnings; } const QStringList& OfxImporterPlugin::errors() const { return d->m_errors; }