[Moneymanagerex-commits] SF.net SVN: moneymanagerex:[5420]

[<vo...@us...>]

Revision: 5420
          http://sourceforge.net/p/moneymanagerex/code/5420
Author:   vomikan
Date:     2013-12-02 09:55:44 +0000 (Mon, 02 Dec 2013)
Log Message:
-----------
fix for total counter

Modified Paths:
--------------
    branches/version_1.0.0.0/src/import_export/qif_export.cpp
    trunk/src/import_export/qif_export.cpp

Modified: branches/version_1.0.0.0/src/import_export/qif_export.cpp
===================================================================
--- branches/version_1.0.0.0/src/import_export/qif_export.cpp	2013-12-02 08:18:01 UTC (rev 5419)
+++ branches/version_1.0.0.0/src/import_export/qif_export.cpp	2013-12-02 09:55:44 UTC (rev 5420)
@@ -402,9 +402,8 @@
                 if (dateToCheckBox_->IsChecked() && Model_Checking::TRANSDATE(transaction) > toDateCtrl_->GetValue())
                     continue;
 
-                numRecords++;
                 if (!progressDlg.Update(numRecords%100
-                    , wxString::Format(_("Exporting transaction %i"), numRecords))) // if cancel clicked
+                    , wxString::Format(_("Exporting transaction %i"), ++numRecords))) // if cancel clicked
                     break; // abort processing
 
                 mmExportTransaction data(transaction.TRANSID, account_id);
@@ -416,6 +415,7 @@
                 if (Model_Checking::type(transaction) == Model_Checking::TRANSFER)
                 {
                     int index = transaction.ACCOUNTID == account_id ? transaction.TOACCOUNTID : transaction.ACCOUNTID;
+                    if (transaction.ACCOUNTID != account_id) numRecords--;
                     if (selected_accounts_id_.Index(index) == wxNOT_FOUND)
                     {
                         //get second part of transfer transaction

Modified: trunk/src/import_export/qif_export.cpp
===================================================================
--- trunk/src/import_export/qif_export.cpp	2013-12-02 08:18:01 UTC (rev 5419)
+++ trunk/src/import_export/qif_export.cpp	2013-12-02 09:55:44 UTC (rev 5420)
@@ -402,9 +402,8 @@
                 if (dateToCheckBox_->IsChecked() && Model_Checking::TRANSDATE(transaction) > toDateCtrl_->GetValue())
                     continue;
 
-                numRecords++;
                 if (!progressDlg.Update(numRecords%100
-                    , wxString::Format(_("Exporting transaction %i"), numRecords))) // if cancel clicked
+                    , wxString::Format(_("Exporting transaction %i"), ++numRecords))) // if cancel clicked
                     break; // abort processing
 
                 mmExportTransaction data(transaction.TRANSID, account_id);
@@ -416,6 +415,7 @@
                 if (Model_Checking::type(transaction) == Model_Checking::TRANSFER)
                 {
                     int index = transaction.ACCOUNTID == account_id ? transaction.TOACCOUNTID : transaction.ACCOUNTID;
+                    if (transaction.ACCOUNTID != account_id) numRecords--;
                     if (selected_accounts_id_.Index(index) == wxNOT_FOUND)
                     {
                         //get second part of transfer transaction

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.