diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js
index 6137007ce..bb57615a0 100644
--- a/resources/assets/js/views/common/documents.js
+++ b/resources/assets/js/views/common/documents.js
@@ -116,7 +116,12 @@ const app = new Vue({
                 let line_discount_amount = 0;
 
                 if (item.discount) {
-                    line_discount_amount = item.total * (item.discount / 100);
+                    if (item.discount_type === 'percentage') {
+                        line_discount_amount = item.total * (item.discount / 100);
+                    } else {
+                        line_discount_amount = item.discount;
+                    }
+
                     item.discount_amount = line_discount_amount
 
                     item_discounted_total = item.total -= line_discount_amount;
@@ -126,7 +131,11 @@ const app = new Vue({
                 let item_discounted_total = item.total;
 
                 if (global_discount) {
-                    item_discounted_total = item.total - (item.total * (global_discount / 100));
+                    if (this.form.discount_type === 'percentage') {
+                        item_discounted_total = item.total - (item.total * (global_discount / 100));
+                    } else {
+                        item_discounted_total = item.total - global_discount;
+                    }
 
                     item_discount = global_discount;
                 }
@@ -241,7 +250,11 @@ const app = new Vue({
 
             // Apply discount to total
             if (global_discount) {
-                discount_total = parseFloat(sub_total + inclusive_tax_total) * (global_discount / 100);
+                if (this.form.discount_type === 'percentage') {
+                    discount_total = parseFloat(sub_total + inclusive_tax_total) * (global_discount / 100);
+                } else {
+                    discount_total = global_discount;
+                }
 
                 this.totals.discount = discount_total;
 
@@ -389,13 +402,31 @@ const app = new Vue({
             this.items[item_index].add_discount = true;
         },
 
+        onChangeDiscountType(type) {
+            this.form.discount_type = type;
+            this.onCalculateTotal();
+        },
+
+        onChangeLineDiscountType(item_index, type) {
+            this.items[item_index].discount_type = type;
+            this.onCalculateTotal();
+        },
+
         onAddTotalDiscount() {
             let discount = document.getElementById('pre-discount').value;
 
-            if (discount < 0) {
-                discount = 0;
-            } else if (discount > 100) {
-                discount = 100;
+            if (this.form.discount_type === 'percentage') {
+                if (discount < 0) {
+                    discount = 0;
+                } else if (discount > 100) {
+                    discount = 100;
+                }
+            } else {
+                if (discount < 0) {
+                    discount = 0;
+                } else if (discount > this.totals.sub) {
+                    discount = this.totals.sub;
+                }
             }
 
             document.getElementById('pre-discount').value = discount;
diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php
index 7bc75000f..9599d6ca0 100644
--- a/resources/views/components/documents/form/line-item.blade.php
+++ b/resources/views/components/documents/form/line-item.blade.php
@@ -76,7 +76,7 @@
                                 @if (!$hideQuantity)
                                     <div>
                                         @stack('quantity_input_start')
-                                        <input 
+                                        <input
                                             type="number"
                                             min="0"
                                             class="form-control text-center p-0 input-number-disabled"
@@ -161,11 +161,15 @@
                                     </div>
                                             @stack('discount_input_start')
                                     <div class="form-group mb-0 w-100" style="display: inline-block; position: relative;">
-                                        <div class="input-group input-group-merge mb-0 select-tax">
+                                        <div class="input-group mb-0 select-tax">
                                             <div class="input-group-prepend">
-                                                <span class="input-group-text" id="input-discount">
-                                                    <i class="fa fa-percent"></i>
-                                                </span>
+                                                <button class="btn btn-sm" :class="[{'btn-outline-primary' : row.discount_type !== 'percentage'}, {'btn-primary' : row.discount_type === 'percentage'}]"
+                                                        @click="onChangeLineDiscountType(index, 'percentage')" type="button">
+                                                    <i class="fa fa-percent fa-sm"></i>
+                                                </button>
+                                                <button class="btn btn-sm" :class="[{'btn-outline-primary' : row.discount_type !== 'amount'}, {'btn-primary' : row.discount_type === 'amount'}]"
+                                                        @click="onChangeLineDiscountType(index, 'amount')" type="button">{{ $currency->symbol }}
+                                                </button>
                                             </div>
                                             <input type="number"
                                                 max="100"
@@ -227,7 +231,7 @@
                                     ></akaunting-select>
                                     @stack('taxes_input_end')
                                 </div>
-                            
+
                                 <div class="line-item-content-right">
                                     <div class="line-item-content-right-price long-texts text-right">
                                         {{ Form::moneyGroup('tax', '', '', ['required' => 'required', 'disabled' => 'true' , 'row-input' => 'true', 'v-model' => 'row_tax.price', 'data-item' => 'total', 'currency' => $currency, 'dynamic-currency' => 'currency'], 0.00, 'text-right input-price disabled-money') }}
@@ -242,7 +246,7 @@
                             <div v-if="row.add_tax" class="line-item-area pb-3" :class="{'pt-2' : row.add_discount}">
                                 <div class="line-item-content">
                                     <div class="long-texts line-item-text" style="float: left; margin-top: 15px; margin-right:2px; position: absolute; left: -63px;">
-                                        {{ trans_choice('general.taxes', 1) }} 
+                                        {{ trans_choice('general.taxes', 1) }}
                                     </div>
 
                                     @stack('taxes_input_start')
diff --git a/resources/views/components/documents/form/totals.blade.php b/resources/views/components/documents/form/totals.blade.php
index 45b2b2e20..8ad21880b 100644
--- a/resources/views/components/documents/form/totals.blade.php
+++ b/resources/views/components/documents/form/totals.blade.php
@@ -54,22 +54,27 @@
                                     <div class="card d-none" :class="[{'show' : discount}]">
                                         <div class="discount card-body">
                                             <div class="row align-items-center">
-                                                <div class="col-sm-6">
-                                                    <div class="input-group input-group-merge">
+                                                <div class="col-sm-8">
+                                                    <div class="input-group">
                                                         <div class="input-group-prepend">
-                                                            <span class="input-group-text" id="input-discount">
-                                                                <i class="fa fa-percent"></i>
-                                                            </span>
+                                                            <button class="btn btn-sm" :class="[{'btn-outline-primary' : form.discount_type !== 'percentage'}, {'btn-primary' : form.discount_type === 'percentage'}]"
+                                                                    @click="onChangeDiscountType('percentage')" type="button">
+                                                                <i class="fa fa-percent fa-sm"></i>
+                                                            </button>
+                                                            <button class="btn btn-sm" :class="[{'btn-outline-primary' : form.discount_type !== 'amount'}, {'btn-primary' : form.discount_type === 'amount'}]"
+                                                                    @click="onChangeDiscountType('amount')" type="button">{{ $currency->symbol }}
+                                                            </button>
                                                         </div>
                                                         {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control', 'v-model' => 'form.discount']) !!}
                                                     </div>
                                                 </div>
-                                                <div class="col-sm-6">
+                                                <div class="col-sm-4">
                                                     <div class="discount-description">
                                                         <strong>{{ trans('invoices.discount_desc') }}</strong>
                                                     </div>
                                                 </div>
                                             </div>
+                                            </div>
                                         </div>
                                         <div class="discount card-footer">
                                             <div class="row float-right">