diff --git a/src/database/models/Invoice.js b/src/database/models/Invoice.js
index 8aa8e52..962e52f 100644
--- a/src/database/models/Invoice.js
+++ b/src/database/models/Invoice.js
@@ -183,17 +183,6 @@ export const Invoice = {
       type: 'date',
       readOnly: false
     },
-    {
-      name: 'vendor',
-      label: 'Vendor',
-      required: true,
-      type: 'object',
-      objectType: 'vendor',
-      showHyperlink: true,
-      visible: (objectData) => {
-        return objectData?.invoiceType === 'purchase' || objectData?.vendor
-      }
-    },
     {
       name: 'orderType',
       label: 'Order Type',
@@ -208,14 +197,25 @@ export const Invoice = {
       objectType: (objectData) => {
         return objectData?.orderType
       },
-      masterFilter: (objectData) => {
-        return {
-          vendor: objectData?.vendor?._id
-        }
-      },
       required: true,
       showHyperlink: true
     },
+    {
+      name: 'vendor',
+      label: 'Vendor',
+      required: true,
+      type: 'object',
+      objectType: 'vendor',
+      showHyperlink: true,
+      readOnly: true,
+      value: (objectData) => {
+        if (objectData?.orderType == 'purchaseOrder') {
+          return objectData?.order?.vendor
+        } else {
+          return objectData?.vendor
+        }
+      }
+    },
     {
       name: 'sentAt',
       label: 'Sent At',