From ed45df296178e0463f82c91d9efd99cbc7859bb8 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Sun, 10 Jul 2022 23:36:16 +0000
Subject: [PATCH]

---
 AyaNovaQBI/FixInvoiceProblems.Designer.cs | 34 +++++++++++++++++++----
 AyaNovaQBI/FixInvoiceProblems.resx        |  6 ++++
 AyaNovaQBI/LinkOrImportAyaObject.cs       |  4 +--
 AyaNovaQBI/MainForm.cs                    |  1 +
 4 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/AyaNovaQBI/FixInvoiceProblems.Designer.cs b/AyaNovaQBI/FixInvoiceProblems.Designer.cs
index 32d3781..af248a5 100644
--- a/AyaNovaQBI/FixInvoiceProblems.Designer.cs
+++ b/AyaNovaQBI/FixInvoiceProblems.Designer.cs
@@ -28,7 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             this.grid = new System.Windows.Forms.DataGridView();
             this.btnOK = new System.Windows.Forms.Button();
             this.Object = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -40,6 +40,8 @@
             this.QBPrice = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.WorkOrderItemPartId = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.QBListID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.WorkOrderItemId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.WorkOrderId = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.grid)).BeginInit();
             this.SuspendLayout();
             // 
@@ -62,7 +64,9 @@
             this.AyaPrice,
             this.QBPrice,
             this.WorkOrderItemPartId,
-            this.QBListID});
+            this.QBListID,
+            this.WorkOrderItemId,
+            this.WorkOrderId});
             this.grid.Location = new System.Drawing.Point(12, 12);
             this.grid.Name = "grid";
             this.grid.ReadOnly = true;
@@ -93,9 +97,9 @@
             // Fix
             // 
             this.Fix.DataPropertyName = "Fix";
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Fix.DefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Fix.DefaultCellStyle = dataGridViewCellStyle1;
             this.Fix.HeaderText = "Fix";
             this.Fix.Name = "Fix";
             this.Fix.ReadOnly = true;
@@ -162,6 +166,24 @@
             this.QBListID.Visible = false;
             this.QBListID.Width = 74;
             // 
+            // WorkOrderItemId
+            // 
+            this.WorkOrderItemId.DataPropertyName = "WorkOrderItemId";
+            this.WorkOrderItemId.HeaderText = "WorkOrderItemId";
+            this.WorkOrderItemId.Name = "WorkOrderItemId";
+            this.WorkOrderItemId.ReadOnly = true;
+            this.WorkOrderItemId.Visible = false;
+            this.WorkOrderItemId.Width = 113;
+            // 
+            // WorkOrderId
+            // 
+            this.WorkOrderId.DataPropertyName = "WorkOrderId";
+            this.WorkOrderId.HeaderText = "WorkOrderId";
+            this.WorkOrderId.Name = "WorkOrderId";
+            this.WorkOrderId.ReadOnly = true;
+            this.WorkOrderId.Visible = false;
+            this.WorkOrderId.Width = 93;
+            // 
             // FixInvoiceProblems
             // 
             this.AcceptButton = this.btnOK;
@@ -195,5 +217,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn QBPrice;
         private System.Windows.Forms.DataGridViewTextBoxColumn WorkOrderItemPartId;
         private System.Windows.Forms.DataGridViewTextBoxColumn QBListID;
+        private System.Windows.Forms.DataGridViewTextBoxColumn WorkOrderItemId;
+        private System.Windows.Forms.DataGridViewTextBoxColumn WorkOrderId;
     }
 }
\ No newline at end of file
diff --git a/AyaNovaQBI/FixInvoiceProblems.resx b/AyaNovaQBI/FixInvoiceProblems.resx
index 7145ee6..137a893 100644
--- a/AyaNovaQBI/FixInvoiceProblems.resx
+++ b/AyaNovaQBI/FixInvoiceProblems.resx
@@ -144,4 +144,10 @@
   <metadata name="QBListID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="WorkOrderItemId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="WorkOrderId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>
\ No newline at end of file
diff --git a/AyaNovaQBI/LinkOrImportAyaObject.cs b/AyaNovaQBI/LinkOrImportAyaObject.cs
index 2f777dc..70e9e5a 100644
--- a/AyaNovaQBI/LinkOrImportAyaObject.cs
+++ b/AyaNovaQBI/LinkOrImportAyaObject.cs
@@ -45,8 +45,8 @@ namespace AyaNovaQBI
 
             lblTitle.Text = AyaItemName;
             cbQBItems.DataSource = QBItems;
-            cbQBItems.DisplayMember = "name";
-            cbQBItems.ValueMember = "id";
+            cbQBItems.DisplayMember = "FullName";
+            cbQBItems.ValueMember = "ID";
             btnCancel.Text = util.AyaTranslations["Cancel"];
             btnOK.Text = util.AyaTranslations["OK"];
             lblImport.Visible = btnImport.Visible = CanImport;
diff --git a/AyaNovaQBI/MainForm.cs b/AyaNovaQBI/MainForm.cs
index 115117d..976d288 100644
--- a/AyaNovaQBI/MainForm.cs
+++ b/AyaNovaQBI/MainForm.cs
@@ -279,6 +279,7 @@ namespace AyaNovaQBI
                     _GridTable.Rows.Add(row);
                 }
                 grid.DataSource = _GridTable;
+                grid.ClearSelection();
             }
             finally
             {