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

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

Revision: 5551
          http://sourceforge.net/p/moneymanagerex/code/5551
Author:   vomikan
Date:     2013-12-12 15:50:39 +0000 (Thu, 12 Dec 2013)
Log Message:
-----------
fix for deposit and withdrawal fields

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

Modified: branches/version_1.0.0.0/src/mmcheckingpanel.cpp
===================================================================
--- branches/version_1.0.0.0/src/mmcheckingpanel.cpp	2013-12-12 14:58:17 UTC (rev 5550)
+++ branches/version_1.0.0.0/src/mmcheckingpanel.cpp	2013-12-12 15:50:39 UTC (rev 5551)
@@ -198,9 +198,9 @@
 
     for (const auto& tran : Model_Account::transaction(this->m_account))
     {
-        double transaction_amount = (Model_Checking::status(tran) != Model_Checking::VOID_) ? Model_Checking::balance(tran, m_AccountID) : 0;
+        double transaction_amount = Model_Checking::balance(tran, m_AccountID);
         account_balance_ += transaction_amount;
-        reconciled_balance_ += (Model_Checking::status(tran) == Model_Checking::RECONCILED) ? transaction_amount : 0;
+        reconciled_balance_ += Model_Checking::reconciled(tran, m_AccountID);
         if (transFilterActive_)
         {
             if (!transFilterDlg_->checkAll(tran, m_AccountID)) continue;
@@ -749,11 +749,15 @@
     case TransactionListCtrl::COL_CATEGORY:
         return tran.CATEGNAME;
     case TransactionListCtrl::COL_WITHDRAWAL:
-        return Model_Checking::balance(tran, m_AccountID) <= 0
-            ? Model_Currency::toString(tran.TRANSAMOUNT, this->m_currency) : "";
+    {
+        double amount = Model_Checking::balance(tran, m_AccountID);
+        return amount <= 0 ? Model_Currency::toString(fabs(amount), this->m_currency) : "";
+    }
     case TransactionListCtrl::COL_DEPOSIT:
-        return Model_Checking::balance(tran, m_AccountID) > 0
-            ? Model_Currency::toString(tran.TRANSAMOUNT, this->m_currency) : "";
+    {
+        double amount = Model_Checking::balance(tran, m_AccountID);
+        return amount > 0 ? Model_Currency::toString(amount, this->m_currency) : "";
+    }
     case TransactionListCtrl::COL_BALANCE:
         return Model_Currency::toString(tran.BALANCE, this->m_currency);
     case TransactionListCtrl::COL_NOTES:

Modified: trunk/src/mmcheckingpanel.cpp
===================================================================
--- trunk/src/mmcheckingpanel.cpp	2013-12-12 14:58:17 UTC (rev 5550)
+++ trunk/src/mmcheckingpanel.cpp	2013-12-12 15:50:39 UTC (rev 5551)
@@ -748,11 +748,15 @@
     case TransactionListCtrl::COL_CATEGORY:
         return tran.CATEGNAME;
     case TransactionListCtrl::COL_WITHDRAWAL:
-        return Model_Checking::balance(tran, m_AccountID) <= 0
-            ? Model_Currency::toString(tran.TRANSAMOUNT, this->m_currency) : "";
+    {
+        double amount = Model_Checking::balance(tran, m_AccountID);
+        return amount <= 0 ? Model_Currency::toString(fabs(amount), this->m_currency) : "";
+    }
     case TransactionListCtrl::COL_DEPOSIT:
-        return Model_Checking::balance(tran, m_AccountID) > 0
-            ? Model_Currency::toString(tran.TRANSAMOUNT, this->m_currency) : "";
+    {
+        double amount = Model_Checking::balance(tran, m_AccountID);
+        return amount > 0 ? Model_Currency::toString(amount, this->m_currency) : "";
+    }
     case TransactionListCtrl::COL_BALANCE:
         return Model_Currency::toString(tran.BALANCE, this->m_currency);
     case TransactionListCtrl::COL_NOTES:

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