diff --git a/app/Models/Credit.php b/app/Models/Credit.php
index 71a0c0085743..8f942d0ea15b 100644
--- a/app/Models/Credit.php
+++ b/app/Models/Credit.php
@@ -41,14 +41,11 @@ class Credit extends BaseModel
     protected $presenter = CreditPresenter::class;
 
     protected $fillable = [
-        'assigned_user_id',
-        'project_id',
         'number',
         'discount',
         'po_number',
         'date',
         'due_date',
-        'partial_due_date',
         'terms',
         'public_notes',
         'private_notes',
@@ -59,8 +56,9 @@ class Credit extends BaseModel
         'tax_name3',
         'tax_rate3',
         'is_amount_discount',
-        'footer',
         'partial',
+        'partial_due_date',
+        'project_id',
         'custom_value1',
         'custom_value2',
         'custom_value3',
@@ -68,7 +66,16 @@ class Credit extends BaseModel
         'line_items',
         'client_id',
         'footer',
+        'custom_surcharge1',
+        'custom_surcharge2',
+        'custom_surcharge3',
+        'custom_surcharge4',
+        'custom_surcharge_tax1',
+        'custom_surcharge_tax2',
+        'custom_surcharge_tax3',
+        'custom_surcharge_tax4',
         'design_id',
+        'assigned_user_id',
         'exchange_rate',
     ];
 
diff --git a/app/Models/Quote.php b/app/Models/Quote.php
index b02b0f99f7da..d23451290ffd 100644
--- a/app/Models/Quote.php
+++ b/app/Models/Quote.php
@@ -42,7 +42,6 @@ class Quote extends BaseModel
     protected $touches = [];
 
     protected $fillable = [
-        'assigned_user_id',
         'number',
         'discount',
         'po_number',
@@ -51,7 +50,6 @@ class Quote extends BaseModel
         'terms',
         'public_notes',
         'private_notes',
-        'project_id',
         'tax_name1',
         'tax_rate1',
         'tax_name2',
@@ -61,6 +59,7 @@ class Quote extends BaseModel
         'is_amount_discount',
         'partial',
         'partial_due_date',
+        'project_id',
         'custom_value1',
         'custom_value2',
         'custom_value3',
@@ -68,7 +67,16 @@ class Quote extends BaseModel
         'line_items',
         'client_id',
         'footer',
+        'custom_surcharge1',
+        'custom_surcharge2',
+        'custom_surcharge3',
+        'custom_surcharge4',
+        'custom_surcharge_tax1',
+        'custom_surcharge_tax2',
+        'custom_surcharge_tax3',
+        'custom_surcharge_tax4',
         'design_id',
+        'assigned_user_id',
         'exchange_rate',
     ];
 
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index 1cdb6d855723..3710d25412e6 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -157,8 +157,11 @@ class HtmlEngine
 
         if ($this->entity->partial > 0) {
             $data['$balance_due'] = ['value' => Number::formatMoney($this->entity->partial, $this->client) ?: ' ', 'label' => ctrans('texts.partial_due')];
+            $data['$balance_due_raw'] = ['value' => $this->entity->partial, 'label' => ctrans('texts.partial_due')];
         } else {
             $data['$balance_due'] = ['value' => Number::formatMoney($this->entity->balance, $this->client) ?: ' ', 'label' => ctrans('texts.balance_due')];
+            $data['$balance_due_raw'] = ['value' => $this->entity->balance, 'label' => ctrans('texts.balance_due')];
+
         }
 
         $data['$quote.balance_due'] = $data['$balance_due'];