diff --git a/app/Http/Controllers/Modals/DocumentTransactions.php b/app/Http/Controllers/Modals/DocumentTransactions.php
index 9e996c305..39879ea9c 100644
--- a/app/Http/Controllers/Modals/DocumentTransactions.php
+++ b/app/Http/Controllers/Modals/DocumentTransactions.php
@@ -156,7 +156,7 @@ class DocumentTransactions extends Controller
 
         $number = $transaction->number;
 
-        $amount = money($transaction->amount, $currency->code, false)->getAmount();
+        $amount = money($transaction->amount_for_document, $currency->code, false)->getAmount();
 
         // Get document Totals
         foreach ($document->totals as $document_total) {
diff --git a/resources/views/modals/documents/payment.blade.php b/resources/views/modals/documents/payment.blade.php
index de09e5c56..15b4311cb 100644
--- a/resources/views/modals/documents/payment.blade.php
+++ b/resources/views/modals/documents/payment.blade.php
@@ -45,8 +45,8 @@
                     <x-form.group.money
                         v-show="form.document_currency_code == form.currency_code"
                         name="amount"
-                        label="{{ trans('general.amount') }}"
-                        value="{{ $amount }}"
+                        :label="trans('general.amount')"
+                        :value="$amount"
                         autofocus="autofocus"
                         :currency="! empty($transaction) ? $transaction->currency : $currency"
                         form-group-class="col-span-6"
@@ -56,7 +56,7 @@
                         <x-form.group.money
                             name="amount"
                             label="{{ trans('general.amount') }}"
-                            value="{{ $amount }}"
+                            :value="$amount"
                             v-model="form.amount"
                             autofocus="autofocus"
                             :currency="! empty($transaction) ? $transaction->currency : $currency"
@@ -127,8 +127,8 @@
                     <x-form.input.hidden name="category_id" :value="$document->category->id" />
                     <x-form.input.hidden name="paid_amount" :value="$document->paid_amount" />
                     <x-form.input.hidden name="amount" :value="$amount" />
-                    <x-form.input.hidden name="currency_code" :value="$document->currency_code" />
-                    <x-form.input.hidden name="currency_rate" :value="$document->currency_rate" v-if="form.document_currency_code == form.currency_code" />
+                    <x-form.input.hidden name="currency_code" :value="! empty($transaction) ? $transaction->currency_code : $document->currency_code" />
+                    <x-form.input.hidden name="currency_rate" :value="! empty($transaction) ? $transaction->currency_rate : $document->currency_rate" v-if="form.document_currency_code == form.currency_code" />
                     <x-form.input.hidden name="company_currency_code" :value="default_currency()" />
                     <x-form.input.hidden name="document_currency_code" :value="$document->currency_code" />
                     <x-form.input.hidden name="document_currency_rate" :value="$document->currency_rate" />