diff --git a/.vscode/launch.json b/.vscode/launch.json
index 0e2049e9..8fd97968 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -53,7 +53,7 @@
         "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
         "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
         "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
-        "AYANOVA_SERVER_TEST_MODE": "false",
+        "AYANOVA_SERVER_TEST_MODE": "true",
         "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
         "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
         "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"
diff --git a/server/AyaNova/DataList/PurchaseOrderDataList.cs b/server/AyaNova/DataList/PurchaseOrderDataList.cs
index dfbef2f5..18b9190a 100644
--- a/server/AyaNova/DataList/PurchaseOrderDataList.cs
+++ b/server/AyaNova/DataList/PurchaseOrderDataList.cs
@@ -24,7 +24,7 @@ namespace AyaNova.DataList
                 TKey = "PurchaseOrderPONumber",
                 FieldKey = "PurchaseOrderPONumber",
                 AyaObjectType = (int)AyaType.PurchaseOrder,
-                UiFieldDataType = (int)UiFieldDataType.Text,
+                UiFieldDataType = (int)UiFieldDataType.Integer,
                 SqlIdColumnName = "apurchaseorder.id",
                 SqlValueColumnName = "apurchaseorder.serial",
                 IsRowId = true
diff --git a/server/AyaNova/models/AyContext.cs b/server/AyaNova/models/AyContext.cs
index 46c2c2b7..c8397b82 100644
--- a/server/AyaNova/models/AyContext.cs
+++ b/server/AyaNova/models/AyContext.cs
@@ -143,6 +143,7 @@ namespace AyaNova.Models
             ///////////////////////////////
             //SERIALIZED OBJECTS
             //
+            modelBuilder.Entity<PurchaseOrder>().Property(z => z.Serial).UseIdentityByDefaultColumn();
             modelBuilder.Entity<Widget>().Property(z => z.Serial).UseIdentityByDefaultColumn();
             modelBuilder.Entity<WorkOrder>().Property(z => z.Serial).UseIdentityByDefaultColumn();
             modelBuilder.Entity<Quote>().Property(z => z.Serial).UseIdentityByDefaultColumn();
diff --git a/server/AyaNova/models/PurchaseOrder.cs b/server/AyaNova/models/PurchaseOrder.cs
index 2175740f..0ce9a4d5 100644
--- a/server/AyaNova/models/PurchaseOrder.cs
+++ b/server/AyaNova/models/PurchaseOrder.cs
@@ -15,7 +15,7 @@ namespace AyaNova.Models
         public long Id { get; set; }
         public uint Concurrency { get; set; }
 
-        [Required]
+       
         public long Serial { get; set; }//WAS PO NUMBER        
         public string Notes { get; set; }
         public string Wiki { get; set; }
diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs
index e264c216..7a01d9ae 100644
--- a/server/AyaNova/util/AySchema.cs
+++ b/server/AyaNova/util/AySchema.cs
@@ -462,7 +462,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
 
                 //Add widget table
                 //id, TEXT, longtext, boolean, currency,
-                await ExecQueryAsync("CREATE TABLE awidget (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, name TEXT NOT NULL UNIQUE, serial BIGINT generated by default as identity NOT NULL," +
+                await ExecQueryAsync("CREATE TABLE awidget (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, name TEXT NOT NULL UNIQUE, serial BIGINT GENERATED BY DEFAULT AS IDENTITY NOT NULL," +
                 "startdate TIMESTAMP, enddate TIMESTAMP, dollaramount DECIMAL(19,4), active BOOL NOT NULL, usertype int4, count INTEGER," +
                 "notes TEXT, userid BIGINT, wiki TEXT, customfields TEXT, tags VARCHAR(255) ARRAY)");
 
@@ -731,7 +731,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
                 "datestarted TIMESTAMP NULL, datecompleted TIMESTAMP NULL, projectoverseerid BIGINT NULL REFERENCES auser(id), accountnumber TEXT)");
 
                 //PURCHASEORDER                           
-                await ExecQueryAsync("CREATE TABLE apurchaseorder (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, serial BIGINT generated by default as identity NOT NULL, " +
+                await ExecQueryAsync("CREATE TABLE apurchaseorder (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, " +
                 "vendormemo TEXT, dropshiptocustomerid BIGINT REFERENCES acustomer, referencenumber TEXT, vendorid BIGINT NOT NULL REFERENCES avendor, " +
                 "ordereddate TIMESTAMP, expectedreceivedate TIMESTAMP, status integer CONSTRAINT chk_status_valid CHECK (status > 0 AND status < 7), " +//"a check constraint is satisfied if the check expression evaluates to true or the null value"
@@ -777,7 +777,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, active BOOL NOT NULL, " +
+                await ExecQueryAsync("CREATE TABLE aworkorder (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, serial BIGINT GENERATED BY DEFAULT AS IDENTITY NOT NULL, active BOOL NOT NULL, " +
                 "notes TEXT, wiki TEXT, customfields TEXT, tags VARCHAR(255) ARRAY )");
 
                 await ExecQueryAsync("CREATE TABLE aworkorderitem (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, workorderid BIGINT NOT NULL REFERENCES aworkorder (id), " +
@@ -829,7 +829,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
                 "notes TEXT, wiki TEXT, customfields TEXT, tags VARCHAR(255) ARRAY )");
 
                 //QUOTE                
-                await ExecQueryAsync("CREATE TABLE aquote (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, serial BIGINT generated by default as identity NOT NULL,  active BOOL NOT NULL, " +
+                await ExecQueryAsync("CREATE TABLE aquote (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, serial BIGINT GENERATED BY DEFAULT AS IDENTITY NOT NULL,  active BOOL NOT NULL, " +
                 "notes TEXT, wiki TEXT, customfields TEXT, tags VARCHAR(255) ARRAY )");
 
                 //QUOTEITEM                
@@ -845,7 +845,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
                 "notes TEXT, wiki TEXT, customfields TEXT, tags VARCHAR(255) ARRAY )");
 
                 //PM                
-                await ExecQueryAsync("CREATE TABLE apm (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, serial BIGINT generated by default as identity NOT NULL,  active BOOL NOT NULL, " +
+                await ExecQueryAsync("CREATE TABLE apm (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, serial BIGINT GENERATED BY DEFAULT AS IDENTITY NOT NULL,  active BOOL NOT NULL, " +
                 "notes TEXT, wiki TEXT, customfields TEXT, tags VARCHAR(255) ARRAY )");
 
                 //PMITEM                
diff --git a/server/AyaNova/util/Seeder.cs b/server/AyaNova/util/Seeder.cs
index 5ac8c28e..a01478f1 100644
--- a/server/AyaNova/util/Seeder.cs
+++ b/server/AyaNova/util/Seeder.cs
@@ -1700,7 +1700,7 @@ namespace AyaNova.Util
             for (int x = 0; x < count; x++)
             {
                 PurchaseOrder o = new PurchaseOrder();
-                 o.VendorId = Fake.Random.Long(1, TotalSeededVendors);
+                o.VendorId = Fake.Random.Long(1, TotalSeededVendors);
                 var poDate = Fake.Date.Between(seedStartWindow, seedEndWindow);
                 o.OrderedDate = poDate.ToUniversalTime();
                 o.ExpectedReceiveDate = poDate.AddDays(5).ToUniversalTime();