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 fdf21997..9019adf2 100644 --- a/server/AyaNova/biz/PurchaseOrderBiz.cs +++ b/server/AyaNova/biz/PurchaseOrderBiz.cs @@ -135,6 +135,7 @@ namespace AyaNova.Biz po.HasTaxes = false; po.HasReceipt = false; po.HasVendorNumber = false; + po.HasUnreceived = false; foreach (PurchaseOrderItem item in po.Items) { @@ -162,6 +163,9 @@ namespace AyaNova.Biz if (item.QuantityReceived > 0) po.HasReceipt = true; + + if (item.QuantityReceived < item.QuantityOrdered) + po.HasUnreceived = true; //Calculate line totals if (item.QuantityOrdered != 0 && item.PurchaseOrderCost != 0) diff --git a/server/AyaNova/models/PurchaseOrder.cs b/server/AyaNova/models/PurchaseOrder.cs index 1fde34a0..845c566d 100644 --- a/server/AyaNova/models/PurchaseOrder.cs +++ b/server/AyaNova/models/PurchaseOrder.cs @@ -52,6 +52,8 @@ namespace AyaNova.Models public bool HasReceipt { get; set; } [NotMapped] public bool HasVendorNumber { get; set; } + [NotMapped] + public bool HasUnreceived { get; set; } }//eoc