Merge pull request #5336 from n-stein/fix(#5296)

fix(#5296): fix for DELETEDTIME = NULL
moneymanagerex · Nov 16, 2022 · 793a8bb · 793a8bb
2 parents 671b8d4 + ed1293d
commit 793a8bb
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/src/model/Model_Category.cpp b/src/model/Model_Category.cpp
@@ -157,8 +157,13 @@ bool Model_Category::is_hidden(int catID, int subcatID)
 
 bool Model_Category::is_used(int id, int sub_id)
 {
-    const auto &trans = Model_Checking::instance().find(Model_Checking::CATEGID(id), Model_Checking::SUBCATEGID(sub_id), Model_Checking::DELETEDTIME(wxEmptyString));
-    if (!trans.empty()) return true;
+    const auto &trans = Model_Checking::instance().find(Model_Checking::CATEGID(id), Model_Checking::SUBCATEGID(sub_id));
+    if (!trans.empty())
+    {
+        for (const auto& txn : trans)
+            if (txn.DELETEDTIME.IsEmpty())
+                return true;
+    }
     const auto &split = Model_Splittransaction::instance().find(Model_Checking::CATEGID(id), Model_Checking::SUBCATEGID(sub_id));
     if (!split.empty())
     {
@@ -176,8 +181,13 @@ bool Model_Category::is_used(int id, int sub_id)
 
 bool Model_Category::is_used(int id)
 {
-    const auto& trans = Model_Checking::instance().find(Model_Checking::CATEGID(id), Model_Checking::DELETEDTIME(wxEmptyString));
-    if (!trans.empty()) return true;
+    const auto& trans = Model_Checking::instance().find(Model_Checking::CATEGID(id));
+    if (!trans.empty())
+    {
+        for (const auto& txn : trans)
+            if (txn.DELETEDTIME.IsEmpty())
+                return true;
+    }
     const auto& split = Model_Splittransaction::instance().find(Model_Checking::CATEGID(id));
     if (!split.empty())
     {
@@ -196,8 +206,10 @@ bool Model_Category::has_income(int id, int sub_id)
 {
     double sum = 0.0;
     auto splits = Model_Splittransaction::instance().get_all();
-    for (const auto& tran: Model_Checking::instance().find(Model_Checking::CATEGID(id), Model_Checking::SUBCATEGID(sub_id), Model_Checking::DELETEDTIME(wxEmptyString)))
+    for (const auto& tran: Model_Checking::instance().find(Model_Checking::CATEGID(id), Model_Checking::SUBCATEGID(sub_id)))
     {
+        if (!tran.DELETEDTIME.IsEmpty()) continue;
+
         switch (Model_Checking::type(tran))
         {
         case Model_Checking::WITHDRAWAL:

diff --git a/src/model/Model_Payee.cpp b/src/model/Model_Payee.cpp
@@ -153,8 +153,13 @@ bool Model_Payee::is_hidden(const Data& record)
 
 bool Model_Payee::is_used(int id)
 {
-    const auto &trans = Model_Checking::instance().find(Model_Checking::PAYEEID(id), Model_Checking::DELETEDTIME(wxEmptyString));
-    if (!trans.empty()) return true;
+    const auto &trans = Model_Checking::instance().find(Model_Checking::PAYEEID(id));
+    if (!trans.empty())
+    {
+        for (const auto& txn : trans)
+            if (txn.DELETEDTIME.IsEmpty())
+                return true;
+    }
     const auto &bills = Model_Billsdeposits::instance().find(Model_Billsdeposits::PAYEEID(id));
     if (!bills.empty()) return true;