diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index 9f2193c8f74a..05a78f07450c 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -136,6 +136,13 @@ class CompanySettings extends BaseSettings
     public $invoice_design_id = 'Wpmbk5ezJn'; //@implemented
     public $quote_design_id = 'Wpmbk5ezJn'; //@implemented
     public $credit_design_id = 'Wpmbk5ezJn'; //@implemented
+
+    public $purchase_order_design_id = 'Wpmbk5ezJn';
+    public $purchase_order_footer = ''; //@implemented
+    public $purchase_order_terms = ''; //@implemented
+    public $purchase_order_public_notes = ''; //@implemented
+    public $require_purchase_order_signature = false;  //@TODO ben to confirm
+    
     public $invoice_footer = ''; //@implemented
     public $credit_footer = ''; //@implemented
     public $credit_terms = ''; //@implemented
@@ -280,6 +287,11 @@ class CompanySettings extends BaseSettings
     public $auto_archive_invoice_cancelled = false;
 
     public static $casts = [
+        'require_purchase_order_signature'   => 'bool',
+        'purchase_order_public_notes'        => 'string',
+        'purchase_order_terms'               => 'string',
+        'purchase_order_design_id'           => 'string',
+        'purchase_order_footer'              => 'string',
         'purchase_order_number_pattern'      => 'string',
         'purchase_order_number_counter'      => 'int',
         'page_numbering_alignment'           => 'string',
diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index 78332a2ae52c..0ebfcbafdaaa 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -709,7 +709,6 @@ class InvoiceController extends BaseController
                         echo Storage::get($file);
                 },  basename($file), ['Content-Type' => 'application/pdf']);
 
-
                 break;
             case 'restore':
                 $this->invoice_repo->restore($invoice);
diff --git a/database/migrations/2022_06_01_224339_create_purchase_order_invitations_table.php b/database/migrations/2022_06_01_224339_create_purchase_order_invitations_table.php
index 859464145dfa..60f95f0900c0 100644
--- a/database/migrations/2022_06_01_224339_create_purchase_order_invitations_table.php
+++ b/database/migrations/2022_06_01_224339_create_purchase_order_invitations_table.php
@@ -44,6 +44,21 @@ class CreatePurchaseOrderInvitationsTable extends Migration
             $table->unsignedInteger('client_id')->nullable()->change();
         });
 
+
+        Company::cursor()->each(function ($company){
+
+            $settings = $company->settings;
+
+            $settings->purchase_order_design_id = 'Wpmbk5ezJn';
+            $settings->purchase_order_footer = ''; //@implemented
+            $settings->purchase_order_terms = ''; //@implemented
+            $settings->purchase_order_public_notes = ''; //@implemented
+            $settings->purchase_order_number_pattern = ''; //@implemented
+            $settings->purchase_order_number_counter = 1; //@implemented
+
+            $company->settings = $settings;
+            $company->save();
+        })
     }
 
     /**
@@ -53,6 +68,5 @@ class CreatePurchaseOrderInvitationsTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('purchase_order_invitations');
     }
 }