Merge branch 'master' into cam3

kgOrdersClient/View.OrderEntryCorrugated.dfm

@@ -1301,6 +1301,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.OrderEntryWeb.dfm

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

kgOrdersClient/View.Orders.pas

@@ -249,11 +249,15 @@ end;
 procedure TFViewOrders.WebButton1Click(Sender: TObject);
 begin
   if OrderID <> '' then
-    ShowSetStatusForm()
-  else
-    ShowToast('Failure: Please select an order');
+  begin
+    if OrderID <> '' then
+      ShowSetStatusForm()
+    else
+      ShowToast('Failure: Please select an order');
+  end;
 end;
 
+
 procedure TFViewOrders.WebFormCreate(Sender: TObject);
 // Initializes important values:
 // PageNumber: What page number the user is on IE 1: 1-10, 2: 11-20 etc