Merge branch 'master' into mac3

kgOrdersClient/View.OrderEntryCorrugated.dfm

@@ -1272,6 +1272,9 @@ object FOrderEntryCorrugated: TFOrderEntryCorrugated
     Connection = DMConnection.ApiConnection
     Left = 1060
     Top = 182
+    object XDataWebDataSet1inQuickBooks: TStringField
+      FieldName = 'inQuickBooks'
+    end
     object XDataWebDataSet1ORDER_ID: TIntegerField
       FieldName = 'ORDER_ID'
     end

kgOrdersClient/View.OrderEntryCorrugated.pas

@@ -199,6 +199,7 @@ type
     btnAdd: TWebButton;
     WebButton2: TWebButton;
     lblFormState: TWebLabel;
+    XDataWebDataSet1inQuickBooks: TStringField;
     procedure WebFormCreate(Sender: TObject);
     [async] procedure getOrder(Order_ID: string);
     [async] procedure getCustomer(customerID: string);

kgOrdersClient/View.OrderEntryWeb.dfm

@@ -1414,6 +1414,9 @@ object FOrderEntryWeb: TFOrderEntryWeb
     Connection = DMConnection.ApiConnection
     Left = 408
     Top = 4
+    object XDataWebDataSet1inQuickBooks: TStringField
+      FieldName = 'inQuickBooks'
+    end
     object XDataWebDataSet1ORDER_ID: TIntegerField
       FieldName = 'ORDER_ID'
     end

kgOrdersClient/View.OrderEntryWeb.pas

@@ -203,6 +203,7 @@ type
     btnAdd: TWebButton;
     WebButton2: TWebButton;
     lblFormState: TWebLabel;
+    XDataWebDataSet1inQuickBooks: TStringField;
     procedure WebFormCreate(Sender: TObject);
     [async] procedure getOrder(Order_ID: string);
     [async] procedure getCustomer(customerID: string);

kgOrdersClient/View.Orders.pas

@@ -247,7 +247,12 @@ end;
 procedure TFViewOrders.WebButton1Click(Sender: TObject);
 begin
   if OrderID <> '' then
-    ShowSetStatusForm()
+  begin
+    if not pnlMessage.ElementHandle.hidden then
+      HideNotification;
+
+    ShowSetStatusForm;
+  end
   else
     ShowToast('Failure: Please select an order');
 end;