From 19084455b0e62f76426dd19c8772033d9a77cd63 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 1 Jul 2022 21:07:00 +0000
Subject: [PATCH]

---
 AyaNovaQBI/SetQBClass.cs | 18 +++++++++++++++++-
 AyaNovaQBI/util.cs       |  8 ++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/AyaNovaQBI/SetQBClass.cs b/AyaNovaQBI/SetQBClass.cs
index d3556e6..4f39287 100644
--- a/AyaNovaQBI/SetQBClass.cs
+++ b/AyaNovaQBI/SetQBClass.cs
@@ -21,7 +21,21 @@ namespace AyaNovaQBI
 
         public DataTable QBClasses { get; set; }
       
-        public string SelectedQBClass { get => (string)cbQBClasses.SelectedValue; set { } }
+     
+
+        public string SelectedQBClass
+        {
+            get
+            {
+                return _selectedQBClass;
+            }
+
+            set
+            {
+                _selectedQBClass = value;
+            }
+        }
+        private string _selectedQBClass;
 
         private void SetQBClass_load(object sender, EventArgs e)
         {
@@ -35,6 +49,8 @@ namespace AyaNovaQBI
             cbQBClasses.DisplayMember = "FullName";
             cbQBClasses.ValueMember = "ID";
             lblStatus.Text = "QuickBooks transaction class";
+
+            cbQBClasses.SelectedValue = _selectedQBClass;
         }
 
 
diff --git a/AyaNovaQBI/util.cs b/AyaNovaQBI/util.cs
index 0c1edfe..8e514b3 100644
--- a/AyaNovaQBI/util.cs
+++ b/AyaNovaQBI/util.cs
@@ -1035,9 +1035,13 @@ namespace AyaNovaQBI
                 "select < Do not use classes> from the list below.  Classes are off by default in QuickBooks.\r\n\r\n" +
                 "This setting is Optional and not required.";
             s3.QBClasses = QBClasses;
-            // s3.SelectedQBClass = TRANSACTION_CLASS_NO_CLASS_SELECTED;
 
-            if (s3.ShowDialog() == DialogResult.Cancel)
+            if (QBClasses.Rows.Contains(QDat.TransactionClass))
+                s3.SelectedQBClass = QDat.TransactionClass;
+            else
+                 s3.SelectedQBClass = TRANSACTION_CLASS_NO_CLASS_SELECTED;
+
+                if (s3.ShowDialog() == DialogResult.Cancel)
             {
                 return pfstat.Cancel;