From d04fadc5e3346feb5dd07016b33ba349b06a1558 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 1 Mar 2021 18:58:18 +0000 Subject: [PATCH] alpha release 101 --- .vscode/launch.json | 2 +- server/AyaNova/biz/PurchaseOrderBiz.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 8fd97968..0e2049e9 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": "true", + "AYANOVA_SERVER_TEST_MODE": "false", "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/biz/PurchaseOrderBiz.cs b/server/AyaNova/biz/PurchaseOrderBiz.cs index 3a284900..d7973962 100644 --- a/server/AyaNova/biz/PurchaseOrderBiz.cs +++ b/server/AyaNova/biz/PurchaseOrderBiz.cs @@ -675,7 +675,7 @@ namespace AyaNova.Biz //have a report mode get or I guess just do it all here (but then need for export as well, but then again this is the way it gets for export via getreportdata) //so perhaps we have a REPORT format of a biz object model and that format has display names mirroring all the fields //it's fetching it here anyway, might as well do the whole shebang? - var batchResults = await ct.PurchaseOrder.AsNoTracking().Where(z => batch.Contains(z.Id)).ToArrayAsync(); + var batchResults = await ct.PurchaseOrder.Include(x=>x.Items).AsNoTracking().Where(z => batch.Contains(z.Id)).ToArrayAsync(); //order the results back into original var orderedList = from id in batch join z in batchResults on id equals z.Id select z; foreach (PurchaseOrder w in orderedList)