diff --git a/server/AyaNova/Controllers/PartWarehouseController.cs b/server/AyaNova/Controllers/PartWarehouseController.cs
index 9fdb2c29..acb81d03 100644
--- a/server/AyaNova/Controllers/PartWarehouseController.cs
+++ b/server/AyaNova/Controllers/PartWarehouseController.cs
@@ -4,6 +4,8 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Logging;
+using Microsoft.EntityFrameworkCore;
+using System.Linq;
 using AyaNova.Models;
 using AyaNova.Api.ControllerHelpers;
 using AyaNova.Biz;
@@ -151,6 +153,20 @@ namespace AyaNova.Api.Controllers
 
 
 
+        /// <summary>
+        /// Get count of PartWarehouses
+        /// </summary>    
+        /// <returns>Total number of part warehouses (active or not)</returns>
+        [HttpGet("count")]
+        public async Task<IActionResult> GetCount()
+        {
+            if (!serverState.IsOpen)
+                return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
+
+            if (!Authorized.HasSelectRole(HttpContext.Items, AyaType.PartWarehouse))
+                return StatusCode(403, new ApiNotAuthorizedResponse());
+            return Ok(ApiOkResponse.Response(await ct.PartWarehouse.CountAsync()));
+        }
 
 
         //------------
diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs
index 44615be5..db44a86f 100644
--- a/server/AyaNova/biz/FormFieldReference.cs
+++ b/server/AyaNova/biz/FormFieldReference.cs
@@ -607,25 +607,21 @@ namespace AyaNova.Biz
                 {
                     List<FormField> l = new List<FormField>();
                     l.Add(new FormField { TKey = "PurchaseOrderPONumber", FieldKey = "Serial", Hideable = false });
+                    l.Add(new FormField { TKey = "Vendor", FieldKey = "VendorId", Hideable = false });
+                    l.Add(new FormField { TKey = "PurchaseOrderStatus", FieldKey = "PurchaseOrderStatus" });
+                    l.Add(new FormField { TKey = "PurchaseOrderOrderedDate", FieldKey = "OrderedDate" });
+                    l.Add(new FormField { TKey = "PurchaseOrderExpectedReceiveDate", FieldKey = "ExpectedReceiveDate" });
+                    l.Add(new FormField { TKey = "PurchaseOrderReferenceNumber", FieldKey = "ReferenceNumber" });
+                    l.Add(new FormField { TKey = "Project", FieldKey = "ProjectId" });
+                    l.Add(new FormField { TKey = "PurchaseOrderVendorMemo", FieldKey = "VendorMemo" });
+                    l.Add(new FormField { TKey = "PurchaseOrderReceiptText1", FieldKey = "Text1" });
+                    l.Add(new FormField { TKey = "PurchaseOrderReceiptText2", FieldKey = "Text2" });
+                    l.Add(new FormField { TKey = "PurchaseOrderDropShipToCustomerID", FieldKey = "DropShipToCustomerId" });                
                     l.Add(new FormField { TKey = "PurchaseOrderNotes", FieldKey = "Notes" });
                     l.Add(new FormField { TKey = "Tags", FieldKey = "Tags" });
                     l.Add(new FormField { TKey = "Wiki", FieldKey = "Wiki" });
                     l.Add(new FormField { TKey = "Attachments", FieldKey = "Attachments" });
 
-                    l.Add(new FormField { TKey = "PurchaseOrderVendorMemo", FieldKey = "VendorMemo" });
-                    l.Add(new FormField { TKey = "PurchaseOrderDropShipToCustomerID", FieldKey = "DropShipToCustomerId" });
-                    l.Add(new FormField { TKey = "PurchaseOrderReferenceNumber", FieldKey = "ReferenceNumber" });
-                    l.Add(new FormField { TKey = "Vendor", FieldKey = "VendorId" });
-                    l.Add(new FormField { TKey = "PurchaseOrderOrderedDate", FieldKey = "OrderedDate" });
-                    l.Add(new FormField { TKey = "PurchaseOrderExpectedReceiveDate", FieldKey = "ExpectedReceiveDate" });
-                    l.Add(new FormField { TKey = "PurchaseOrderStatus", FieldKey = "PurchaseOrderStatus" });
-                    l.Add(new FormField { TKey = "Project", FieldKey = "ProjectId" });
-                    l.Add(new FormField { TKey = "PurchaseOrderReceiptText1", FieldKey = "Text1" });
-                    l.Add(new FormField { TKey = "PurchaseOrderReceiptText2", FieldKey = "Text2" });
-                    //todo: may need more here for the receiving form and grid
-                    //as they will be hideable                    
-
-
                     l.Add(new FormField { TKey = "PurchaseOrderCustom1", FieldKey = "PurchaseOrderCustom1", IsCustomField = true });
                     l.Add(new FormField { TKey = "PurchaseOrderCustom2", FieldKey = "PurchaseOrderCustom2", IsCustomField = true });
                     l.Add(new FormField { TKey = "PurchaseOrderCustom3", FieldKey = "PurchaseOrderCustom3", IsCustomField = true });
diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json
index 107ca1aa..454cac9c 100644
--- a/server/AyaNova/resource/de.json
+++ b/server/AyaNova/resource/de.json
@@ -506,6 +506,7 @@
   "Project": "Projekt",
   "PurchaseOrder": "Einkaufsauftrag",
   "PurchaseOrderItem": "Einkaufsauftragsposten",
+  "PurchaseOrderItemList": "Bestellpositionen",
   "PurchaseOrderReceipt": "Einkaufsauftragseingang",
   "PurchaseOrderReceiptItem": "Einkaufsauftragseingang - Posten",
   "Rate": "Satz",
diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json
index d674115a..597e1262 100644
--- a/server/AyaNova/resource/en.json
+++ b/server/AyaNova/resource/en.json
@@ -506,6 +506,7 @@
   "Project": "Project",
   "PurchaseOrder": "Purchase Order",
   "PurchaseOrderItem": "Purchase Order Item",
+  "PurchaseOrderItemList": "Order items",
   "PurchaseOrderReceipt": "Purchase Order Receipt",
   "PurchaseOrderReceiptItem": "Purchase order receipt item",
   "Rate": "Rate",
diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json
index bd5613b4..5c9a4682 100644
--- a/server/AyaNova/resource/es.json
+++ b/server/AyaNova/resource/es.json
@@ -505,6 +505,7 @@
   "Project": "Proyecto",
   "PurchaseOrder": "Orden de compra",
   "PurchaseOrderItem": "Elemento de la orden de compra",
+  "PurchaseOrderItemList": "Encargar artículos",
   "PurchaseOrderReceipt": "Recibo orden de compra",
   "PurchaseOrderReceiptItem": "Elemento de recibo de orden de compra",
   "Rate": "Tarifa",
diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json
index 43d36d37..c3f6eb51 100644
--- a/server/AyaNova/resource/fr.json
+++ b/server/AyaNova/resource/fr.json
@@ -506,6 +506,7 @@
   "Project": "Projet",
   "PurchaseOrder": "Bon de commande",
   "PurchaseOrderItem": "Élément de bon de commande",
+  "PurchaseOrderItemList": "Articles de commande d'achat",
   "PurchaseOrderReceipt": "Reçu de bon de commande",
   "PurchaseOrderReceiptItem": "Élément de reçu de bon de commande",
   "Rate": "Tarif",