diff --git a/app/Export/CSV/CreditExport.php b/app/Export/CSV/CreditExport.php
index 95160f43dc41..e9dbca9e524b 100644
--- a/app/Export/CSV/CreditExport.php
+++ b/app/Export/CSV/CreditExport.php
@@ -14,6 +14,7 @@ namespace App\Export\CSV;
 use App\Libraries\MultiDB;
 use App\Models\Client;
 use App\Models\Company;
+use App\Models\Credit;
 use App\Transformers\CreditTransformer;
 use App\Utils\Ninja;
 use Illuminate\Support\Facades\App;
@@ -35,7 +36,7 @@ class CreditExport
         'custom_surcharge2' => 'custom_surcharge2',
         'custom_surcharge3' => 'custom_surcharge3',
         'custom_surcharge4' => 'custom_surcharge4',
-        'country' => 'client.country_id',
+        'country' => 'country_id',
         'custom_value1' => 'custom_value1',
         'custom_value2' => 'custom_value2',
         'custom_value3' => 'custom_value3',
@@ -58,15 +59,18 @@ class CreditExport
         'tax_name2' => 'tax_name2',
         'tax_name3' => 'tax_name3',
         'tax_rate1' => 'tax_rate1',
-        'tax_rate1' => 'tax_rate1',
-        'tax_rate1' => 'tax_rate1',
+        'tax_rate2' => 'tax_rate2',
+        'tax_rate3' => 'tax_rate3',
+        'terms' => 'terms',
+        'total_taxes' => 'total_taxes',
+        'currency' => 'currency'
     ];
 
     private array $decorate_keys = [
-        'client.country_id',
-        'client.shipping_country_id',
-        'client.currency',
-        'client.industry',
+        'country',
+        'client',
+        'invoice',
+        'currency',
     ];
 
     public function __construct(Company $company, array $report_keys)
@@ -91,14 +95,14 @@ class CreditExport
         //insert the header
         $this->csv->insertOne($this->buildHeader());
 
-        Client::with('contacts')->where('company_id', $this->company->id)
-                                ->where('is_deleted',0)
-                                ->cursor()
-                                ->each(function ($client){
+        Credit::with('client')->where('company_id', $this->company->id)
+                            ->where('is_deleted',0)
+                            ->cursor()
+                            ->each(function ($credit){
 
-                                    $this->csv->insertOne($this->buildRow($client)); 
+                                $this->csv->insertOne($this->buildRow($credit)); 
 
-                                });
+                            });
 
 
         return $this->csv->toString(); 
@@ -116,51 +120,36 @@ class CreditExport
         return $header;
     }
 
-    private function buildRow(Client $client) :array
+    private function buildRow(Credit $credit) :array
     {
 
-        $transformed_contact = false;
-
-        $transformed_client = $this->client_transformer->transform($client);
-
-        if($contact = $client->contacts()->first())
-            $transformed_contact = $this->contact_transformer->transform($contact);
-
+        $transformed_credit = $this->credit_transformer->transform($credit);
 
         $entity = [];
 
         foreach(array_values($this->report_keys) as $key){
 
-            $parts = explode(".",$key);
-            $entity[$parts[1]] = "";
-
-            if($parts[0] == 'client') {
-                $entity[$parts[1]] = $transformed_client[$parts[1]];
-            }
-            elseif($parts[0] == 'contact') {
-                $entity[$parts[1]] = $transformed_contact[$parts[1]];
-            }
-
+                $entity[$key] = $transformed_credit[$key];
         }
 
-        return $this->decorateAdvancedFields($client, $entity);
+        return $this->decorateAdvancedFields($credit, $entity);
 
     }
 
-    private function decorateAdvancedFields(Client $client, array $entity) :array
+    private function decorateAdvancedFields(Credit $credit, array $entity) :array
     {
 
         if(array_key_exists('country_id', $entity))
-            $entity['country_id'] = $client->country ? ctrans("texts.country_{$client->country->name}") : ""; 
-
-        if(array_key_exists('shipping_country_id', $entity))
-            $entity['shipping_country_id'] = $client->shipping_country ? ctrans("texts.country_{$client->shipping_country->name}") : ""; 
+            $entity['country_id'] = $credit->client->country ? ctrans("texts.country_{$credit->client->country->name}") : ""; 
 
         if(array_key_exists('currency', $entity))
-            $entity['currency'] = $client->currency()->code;
+            $entity['currency'] = $credit->client->currency()->code;
 
-        if(array_key_exists('industry_id', $entity))
-            $entity['industry_id'] = $client->industry ? ctrans("texts.industry_{$client->industry->name}") : ""; 
+        if(array_key_exists('invoice_id', $entity))
+            $entity['invoice_id'] = $credit->invoice ? $credit->invoice->number : "";
+
+        if(array_key_exists('client_id', $entity))
+            $entity['client_id'] = $credit->client->present()->name();
 
         return $entity;
     }
diff --git a/app/Export/CSV/DocumentExport.php b/app/Export/CSV/DocumentExport.php
new file mode 100644
index 000000000000..531ae9664ec8
--- /dev/null
+++ b/app/Export/CSV/DocumentExport.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Export\CSV;
+
+use App\Libraries\MultiDB;
+use App\Models\Client;
+use App\Models\Company;
+use App\Models\Credit;
+use App\Models\Document;
+use App\Transformers\DocumentTransformer;
+use App\Utils\Ninja;
+use Illuminate\Support\Facades\App;
+use League\Csv\Writer;
+
+class DocumentExport
+{
+    private $company;
+
+    private $report_keys;
+
+    private $entity_transformer;
+
+    private array $entity_keys = [
+        'record_type' => 'record_type',
+        'record_name' => 'record_name',
+        'name' => 'name',
+        'type' => 'type',
+        'created_at' => 'created_at',
+    ];
+
+    private array $decorate_keys = [
+
+    ];
+
+    public function __construct(Company $company, array $report_keys)
+    {
+        $this->company = $company;
+        $this->report_keys = $report_keys;
+        $this->entity_transformer = new DocumentTransformer();
+    }
+
+    public function run()
+    {
+
+        MultiDB::setDb($this->company->db);
+        App::forgetInstance('translator');
+        App::setLocale($this->company->locale());
+        $t = app('translator');
+        $t->replace(Ninja::transformTranslations($this->company->settings));
+
+        //load the CSV document from a string
+        $this->csv = Writer::createFromString();
+
+        //insert the header
+        $this->csv->insertOne($this->buildHeader());
+
+        Document::where('company_id', $this->company->id)
+                ->cursor()
+                ->each(function ($entity){
+
+                    $this->csv->insertOne($this->buildRow($entity)); 
+
+                });
+
+
+        return $this->csv->toString(); 
+
+    }
+
+    private function buildHeader() :array
+    {
+
+        $header = [];
+
+        foreach(array_keys($this->report_keys) as $key)
+            $header[] = ctrans("texts.{$key}");
+
+        return $header;
+    }
+
+    private function buildRow(Document $document) :array
+    {
+
+        $transformed_entity = $this->entity_transformer->transform($document);
+
+        $entity = [];
+
+        foreach(array_values($this->report_keys) as $key){
+
+                $entity[$key] = $transformed_entity[$key];
+        }
+
+        return $this->decorateAdvancedFields($document, $entity);
+
+    }
+
+    private function decorateAdvancedFields(Document $document, array $entity) :array
+    {
+
+        // if(array_key_exists('country_id', $entity))
+        //     $entity['country_id'] = $credit->client->country ? ctrans("texts.country_{$credit->client->country->name}") : ""; 
+
+        return $entity;
+    }
+
+}