diff --git a/app/Filters/PurchaseOrderFilters.php b/app/Filters/PurchaseOrderFilters.php
new file mode 100644
index 000000000000..38be4155d694
--- /dev/null
+++ b/app/Filters/PurchaseOrderFilters.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Filters;
+
+
+
+use App\Models\PurchaseOrder;
+use App\Models\User;
+use Illuminate\Database\Eloquent\Builder;
+
+class PurchaseOrderFilters extends QueryFilters
+{
+    /**
+     * Filter based on client status.
+     *
+     * Statuses we need to handle
+     * - all
+     * - paid
+     * - unpaid
+     * - overdue
+     * - reversed
+     *
+     * @return Builder
+     */
+    public function credit_status(string $value = '') :Builder
+    {
+        if (strlen($value) == 0) {
+            return $this->builder;
+        }
+
+        $status_parameters = explode(',', $value);
+
+        if (in_array('all', $status_parameters)) {
+            return $this->builder;
+        }
+
+        if (in_array('draft', $status_parameters)) {
+            $this->builder->where('status_id', PurchaseOrder::STATUS_DRAFT);
+        }
+
+        if (in_array('partial', $status_parameters)) {
+            $this->builder->where('status_id', PurchaseOrder::STATUS_PARTIAL);
+        }
+
+        if (in_array('applied', $status_parameters)) {
+            $this->builder->where('status_id', PurchaseOrder::STATUS_APPLIED);
+        }
+
+        //->where('due_date', '>', Carbon::now())
+        //->orWhere('partial_due_date', '>', Carbon::now());
+
+        return $this->builder;
+    }
+
+    /**
+     * Filter based on search text.
+     *
+     * @param string query filter
+     * @return Builder
+     * @deprecated
+     */
+    public function filter(string $filter = '') : Builder
+    {
+        if (strlen($filter) == 0) {
+            return $this->builder;
+        }
+
+        return  $this->builder->where(function ($query) use ($filter) {
+            $query->where('purchase_orders.number', 'like', '%'.$filter.'%')
+                ->orWhere('purchase_orders.number', 'like', '%'.$filter.'%')
+                ->orWhere('purchase_orders.date', 'like', '%'.$filter.'%')
+                ->orWhere('purchase_orders.amount', 'like', '%'.$filter.'%')
+                ->orWhere('purchase_orders.balance', 'like', '%'.$filter.'%')
+                ->orWhere('purchase_orders.custom_value1', 'like', '%'.$filter.'%')
+                ->orWhere('purchase_orders.custom_value2', 'like', '%'.$filter.'%')
+                ->orWhere('purchase_orders.custom_value3', 'like', '%'.$filter.'%')
+                ->orWhere('purchase_orders.custom_value4', 'like', '%'.$filter.'%');
+        });
+    }
+
+    /**
+     * Filters the list based on the status
+     * archived, active, deleted - legacy from V1.
+     *
+     * @param string filter
+     * @return Builder
+     */
+    public function status(string $filter = '') : Builder
+    {
+        if (strlen($filter) == 0) {
+            return $this->builder;
+        }
+
+        $table = 'purchase_orders';
+        $filters = explode(',', $filter);
+
+        return $this->builder->where(function ($query) use ($filters, $table) {
+            $query->whereNull($table.'.id');
+
+            if (in_array(parent::STATUS_ACTIVE, $filters)) {
+                $query->orWhereNull($table.'.deleted_at');
+            }
+
+            if (in_array(parent::STATUS_ARCHIVED, $filters)) {
+                $query->orWhere(function ($query) use ($table) {
+                    $query->whereNotNull($table.'.deleted_at');
+
+                    if (! in_array($table, ['users'])) {
+                        $query->where($table.'.is_deleted', '=', 0);
+                    }
+                });
+            }
+
+            if (in_array(parent::STATUS_DELETED, $filters)) {
+                $query->orWhere($table.'.is_deleted', '=', 1);
+            }
+        });
+    }
+
+    /**
+     * Sorts the list based on $sort.
+     *
+     * @param string sort formatted as column|asc
+     * @return Builder
+     */
+    public function sort(string $sort) : Builder
+    {
+        $sort_col = explode('|', $sort);
+
+        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+    }
+
+    /**
+     * Returns the base query.
+     *
+     * @param int company_id
+     * @param User $user
+     * @return Builder
+     * @deprecated
+     */
+    public function baseQuery(int $company_id, User $user) : Builder
+    {
+        // ..
+    }
+
+    /**
+     * Filters the query by the users company ID.
+     *
+     * We need to ensure we are using the correct company ID
+     * as we could be hitting this from either the client or company auth guard
+     *
+     */
+    public function entityFilter()
+    {
+        if (auth()->guard('contact')->user()) {
+            return $this->contactViewFilter();
+        } else {
+            return $this->builder->company();
+        }
+
+//            return $this->builder->whereCompanyId(auth()->user()->company()->id);
+    }
+
+    /**
+     * We need additional filters when showing purchase orders for the
+     * client portal. Need to automatically exclude drafts and cancelled purchase orders.
+     *
+     * @return Builder
+     */
+    private function contactViewFilter() : Builder
+    {
+        return $this->builder
+            ->whereCompanyId(auth()->guard('contact')->user()->company->id)
+            ->whereNotIn('status_id', [PurchaseOrder::STATUS_DRAFT]);
+    }
+}