diff --git a/server/AyaNova/models/WorkOrder.cs b/server/AyaNova/models/WorkOrder.cs
index 405c009b..c292c7c7 100644
--- a/server/AyaNova/models/WorkOrder.cs
+++ b/server/AyaNova/models/WorkOrder.cs
@@ -30,13 +30,13 @@ namespace AyaNova.Models
 
         [Required]
         public long CustomerId { get; set; }
-        public long ProjectId { get; set; }
+        public long? ProjectId { get; set; }
         public string InternalReferenceNumber { get; set; }
         public string CustomerReferenceNumber { get; set; }
         public string CustomerContactName { get; set; }
-        public long FromQuoteId { get; set; }
-        public long FromPMId { get; set; }
-        public long FromCSRId { get; set; }
+        public long? FromQuoteId { get; set; }
+        public long? FromPMId { get; set; }
+        public long? FromCSRId { get; set; }
         public DateTime ServiceDate { get; set; }
         public DateTime CompleteByDate { get; set; }
         public string InvoiceNumber { get; set; }
diff --git a/server/AyaNova/models/WorkOrderItem.cs b/server/AyaNova/models/WorkOrderItem.cs
index 7211f4a3..c77eb508 100644
--- a/server/AyaNova/models/WorkOrderItem.cs
+++ b/server/AyaNova/models/WorkOrderItem.cs
@@ -22,8 +22,8 @@ namespace AyaNova.Models
         [Required]
         public long WorkOrderId { get; set; }
         public string TechNotes { get; set; }
-        public long WorkorderItemStatusId { get; set; }
-        public long WorkorderItemPriorityId { get; set; }
+        public long? WorkorderItemStatusId { get; set; }
+        public long? WorkorderItemPriorityId { get; set; }
         public DateTime RequestDate { get; set; }
         public bool WarrantyService { get; set; } = false;
 
diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs
index 0a341a3c..7d3f1875 100644
--- a/server/AyaNova/util/AySchema.cs
+++ b/server/AyaNova/util/AySchema.cs
@@ -24,14 +24,14 @@ namespace AyaNova.Util
 
         internal const long EXPECTED_COLUMN_COUNT = 929;
         internal const long EXPECTED_INDEX_COUNT = 141;
-        internal const long EXPECTED_CHECK_CONSTRAINTS = 431;
+        internal const long EXPECTED_CHECK_CONSTRAINTS = 429;
         internal const long EXPECTED_FOREIGN_KEY_CONSTRAINTS = 115;
         internal const long EXPECTED_VIEWS = 6;
         internal const long EXPECTED_ROUTINES = 2;
 
         //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!!
 
-        /////////////////////////////////////////////////////////////////   
+        /////////////////////////////////////////////////////////////////   (C929:I141:CC429:FC115:V6:R2)
 
 
 
@@ -759,7 +759,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
                 //WORKORDER                
                 await ExecQueryAsync("CREATE TABLE aworkorder (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, serial BIGINT GENERATED BY DEFAULT AS IDENTITY NOT NULL, "
                     + "notes TEXT, wiki TEXT, customfields TEXT, tags VARCHAR(255) ARRAY, customerid BIGINT NOT NULL REFERENCES acustomer (id), "
-                    + "projectid BIGINT NOT NULL REFERENCES aproject (id), internalreferencenumber text, customerreferencenumber text, customercontactname text, "
+                    + "projectid BIGINT REFERENCES aproject, internalreferencenumber text, customerreferencenumber text, customercontactname text, "
                     + "servicedate TIMESTAMP, completebydate TIMESTAMP, invoicenumber TEXT, customersignature TEXT, customersignaturename TEXT, customersignaturecaptured TIMESTAMP, "
                     + "postaddress TEXT, postcity TEXT, postregion TEXT, postcountry TEXT, postcode TEXT, address TEXT, city TEXT, region TEXT, country TEXT, latitude DECIMAL(9,6), longitude DECIMAL(9,6) "
                     + ")");