diff --git a/app/Http/Controllers/Settings/Localisation.php b/app/Http/Controllers/Settings/Localisation.php
index ea95628ba..fc7200491 100644
--- a/app/Http/Controllers/Settings/Localisation.php
+++ b/app/Http/Controllers/Settings/Localisation.php
@@ -41,12 +41,20 @@ class Localisation extends Controller
             'after' => trans('settings.localisation.percent.after'),
         ];
 
+        $discount_locations = [
+            'no' => trans('general.disabled'),
+            'item' => trans('settings.localisation.discount_location.item'),
+            'total' => trans('settings.localisation.discount_location.total'),
+            'both' => trans('settings.localisation.discount_location.both'),
+        ];
+
         return view('settings.localisation.edit', compact(
             'setting',
             'timezones',
             'date_formats',
             'date_separators',
-            'percent_positions'
+            'percent_positions',
+            'discount_locations'
         ));
     }
 }
diff --git a/app/Models/Purchase/BillItem.php b/app/Models/Purchase/BillItem.php
index 942454b40..34e5710c8 100644
--- a/app/Models/Purchase/BillItem.php
+++ b/app/Models/Purchase/BillItem.php
@@ -13,6 +13,13 @@ class BillItem extends Model
 
     protected $table = 'bill_items';
 
+    /**
+     * The accessors to append to the model's array form.
+     *
+     * @var array
+     */
+    protected $appends = ['discount'];
+
     /**
      * Attributes that should be mass-assignable.
      *
@@ -100,12 +107,12 @@ class BillItem extends Model
      *
      * @return string
      */
-    public function getDiscountRateAttribute($value)
+    public function getDiscountAttribute()
     {
         if (setting('localisation.percent_position', 'after') === 'after') {
-            $text = ($this->discount_type === 'normal') ? $value . '%' : $value;
+            $text = ($this->discount_type === 'normal') ? $this->discount_rate . '%' : $this->discount_rate;
         } else {
-            $text = ($this->discount_type === 'normal') ? '%' . $value : $value;
+            $text = ($this->discount_type === 'normal') ? '%' . $this->discount_rate : $this->discount_rate;
         }
 
         return $text;
diff --git a/app/Models/Sale/InvoiceItem.php b/app/Models/Sale/InvoiceItem.php
index e55577291..10c3ddab1 100644
--- a/app/Models/Sale/InvoiceItem.php
+++ b/app/Models/Sale/InvoiceItem.php
@@ -12,6 +12,13 @@ class InvoiceItem extends Model
 
     protected $table = 'invoice_items';
 
+    /**
+     * The accessors to append to the model's array form.
+     *
+     * @var array
+     */
+    protected $appends = ['discount'];
+
     /**
      * Attributes that should be mass-assignable.
      *
@@ -99,12 +106,12 @@ class InvoiceItem extends Model
      *
      * @return string
      */
-    public function getDiscountRateAttribute($value)
+    public function getDiscountAttribute()
     {
         if (setting('localisation.percent_position', 'after') === 'after') {
-            $text = ($this->discount_type === 'normal') ? $value . '%' : $value;
+            $text = ($this->discount_type === 'normal') ? $this->discount_rate . '%' : $this->discount_rate;
         } else {
-            $text = ($this->discount_type === 'normal') ? '%' . $value : $value;
+            $text = ($this->discount_type === 'normal') ? '%' . $this->discount_rate : $this->discount_rate;
         }
 
         return $text;
diff --git a/resources/lang/en-GB/bills.php b/resources/lang/en-GB/bills.php
index 5914cf59b..6c2831b9e 100644
--- a/resources/lang/en-GB/bills.php
+++ b/resources/lang/en-GB/bills.php
@@ -13,7 +13,7 @@ return [
     'price'                 => 'Price',
     'sub_total'             => 'Subtotal',
     'discount'              => 'Discount',
-    'item_discount'         => 'Item Discount',
+    'item_discount'         => 'Line Discount',
     'tax_total'             => 'Tax Total',
     'total'                 => 'Total',
 
diff --git a/resources/lang/en-GB/invoices.php b/resources/lang/en-GB/invoices.php
index e06ce9a68..a2719ca16 100644
--- a/resources/lang/en-GB/invoices.php
+++ b/resources/lang/en-GB/invoices.php
@@ -13,7 +13,7 @@ return [
     'price'                 => 'Price',
     'sub_total'             => 'Subtotal',
     'discount'              => 'Discount',
-    'item_discount'         => 'Item Discount',
+    'item_discount'         => 'Line Discount',
     'tax_total'             => 'Tax Total',
     'total'                 => 'Total',
 
diff --git a/resources/lang/en-GB/settings.php b/resources/lang/en-GB/settings.php
index 044061471..394c2910d 100644
--- a/resources/lang/en-GB/settings.php
+++ b/resources/lang/en-GB/settings.php
@@ -29,6 +29,12 @@ return [
             'before'        => 'Before Number',
             'after'         => 'After Number',
         ],
+        'discount_location' => [
+            'name'          => 'Discount Location',
+            'item'          => 'At line',
+            'total'         => 'At total',
+            'both'          => 'Both line and total',
+        ],
     ],
 
     'invoice' => [
diff --git a/resources/views/purchases/bills/create.blade.php b/resources/views/purchases/bills/create.blade.php
index f344556cb..3840b6274 100644
--- a/resources/views/purchases/bills/create.blade.php
+++ b/resources/views/purchases/bills/create.blade.php
@@ -30,6 +30,7 @@
                     {{ Form::textGroup('order_number', trans('bills.order_number'), 'shopping-cart',[]) }}
 
                     <div class="col-sm-12 mb-4">
+                        @php $item_colspan = in_array(setting('localisation.discount_location', 'total'), ['item', 'both']) ? '6' : '5' @endphp
                         {!! Form::label('items', trans_choice('general.items', 2), ['class' => 'form-control-label']) !!}
                         <div class="table-responsive overflow-x-scroll overflow-y-hidden ">
                             <table class="table table-bordered" id="items">
@@ -51,9 +52,11 @@
                                             <th class="text-right border-right-0 border-bottom-0">{{ trans('bills.price') }}</th>
                                         @stack('price_th_end')
 
-                                        @stack('discount_th_start')
-                                            <th class="text-right border-right-0 border-bottom-0">{{ trans('bills.discount') }}</th>
-                                        @stack('discount_th_end')
+                                        @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
+                                            @stack('discount_th_start')
+                                                <th class="text-right border-right-0 border-bottom-0">{{ trans('bills.discount') }}</th>
+                                            @stack('discount_th_end')
+                                        @endif
 
                                         @stack('taxes_th_start')
                                             <th class="text-right border-right-0 border-bottom-0">{{ trans_choice('general.taxes', 1) }}</th>
@@ -73,13 +76,13 @@
                                                 <button type="button" @click="onAddItem" id="button-add-item" data-toggle="tooltip" title="{{ trans('general.add') }}" class="btn btn-icon btn-outline-success btn-lg" data-original-title="{{ trans('general.add') }}"><i class="fa fa-plus"></i>
                                                 </button>
                                             </td>
-                                            <td class="text-right border-bottom-0" colspan="6" :colspan="colspan"></td>
+                                            <td class="text-right border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan"></td>
                                         </tr>
                                     @stack('add_item_td_end')
 
                                     @stack('sub_total_td_start')
                                         <tr id="tr-subtotal">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="6" :colspan="colspan">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
                                                 <strong>{{ trans('bills.sub_total') }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
@@ -90,74 +93,78 @@
                                         </tr>
                                     @stack('sub_total_td_end')
 
-                                    @stack('item_discount_td_start')
-                                    <tr id="tr-subtotal">
-                                        <td class="text-right border-right-0 border-bottom-0" colspan="6" :colspan="colspan">
-                                            <strong>{{ trans('bills.item_discount') }}</strong>
-                                        </td>
-                                        <td class="text-right border-bottom-0 long-texts">
-                                            {{ Form::moneyGroup('item_discount', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.item_discount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
-                                            <span id="item-discount" v-if="totals.item_discount" v-html="totals.item_discount"></span>
-                                            <span v-else>@money(0, $currency->code, true)</span>
-                                        </td>
-                                    </tr>
-                                    @stack('item_discount_td_end')
-
-                                    @stack('add_discount_td_start')
-                                        <tr id="tr-discount">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="6" :colspan="colspan">
-                                                <el-popover
-                                                    popper-class="p-0 h-0"
-                                                    placement="bottom"
-                                                    width="300"
-                                                    v-model="discount">
-                                                    <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="input-group-prepend">
-                                                                            <span class="input-group-text" id="input-discount">
-                                                                                <i class="fa fa-percent"></i>
-                                                                            </span>
-                                                                        </div>
-                                                                        {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
-                                                                    </div>
-                                                                </div>
-                                                                <div class="col-sm-6">
-                                                                    <div class="discount-description">
-                                                                        <strong>{{ trans('invoices.discount_desc') }}</strong>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="discount card-footer">
-                                                            <div class="row float-right">
-                                                                <div class="col-xs-12 col-sm-12">
-                                                                    <a href="javascript:void(0)" @click="discount = false" class="btn btn-outline-secondary header-button-top" @click="closePayment">
-                                                                        {{ trans('general.cancel') }}
-                                                                    </a>
-                                                                    {!! Form::button(trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success header-button-top']) !!}
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                    <el-link class="cursor-pointer text-info" slot="reference" type="primary" v-if="!totals.discount_text">{{ trans('invoices.add_discount') }}</el-link>
-                                                    <el-link slot="reference" type="primary" v-if="totals.discount_text" v-html="totals.discount_text"></el-link>
-                                                </el-popover>
+                                    @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
+                                        @stack('item_discount_td_start')
+                                        <tr id="tr-subtotal">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
+                                                <strong>{{ trans('bills.item_discount') }}</strong>
                                             </td>
-                                            <td class="text-right border-bottom-0">
-                                                {{ Form::moneyGroup('discount_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.discount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
-                                                <span id="discount-total" v-if="totals.discount" v-html="totals.discount"></span>
+                                            <td class="text-right border-bottom-0 long-texts">
+                                                {{ Form::moneyGroup('item_discount', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.item_discount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                                <span id="item-discount" v-if="totals.item_discount" v-html="totals.item_discount"></span>
                                                 <span v-else>@money(0, $currency->code, true)</span>
-                                                {!! Form::hidden('discount', null, ['id' => 'discount', 'class' => 'form-control text-right', 'v-model' => 'form.discount']) !!}
                                             </td>
                                         </tr>
-                                    @stack('add_discount_td_end')
+                                        @stack('item_discount_td_end')
+                                    @endif
+
+                                    @if (in_array(setting('localisation.discount_location', 'total'), ['total', 'both']))
+                                        @stack('add_discount_td_start')
+                                            <tr id="tr-discount">
+                                                <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
+                                                    <el-popover
+                                                        popper-class="p-0 h-0"
+                                                        placement="bottom"
+                                                        width="300"
+                                                        v-model="discount">
+                                                        <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="input-group-prepend">
+                                                                                <span class="input-group-text" id="input-discount">
+                                                                                    <i class="fa fa-percent"></i>
+                                                                                </span>
+                                                                            </div>
+                                                                            {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
+                                                                        </div>
+                                                                    </div>
+                                                                    <div class="col-sm-6">
+                                                                        <div class="discount-description">
+                                                                            <strong>{{ trans('invoices.discount_desc') }}</strong>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="discount card-footer">
+                                                                <div class="row float-right">
+                                                                    <div class="col-xs-12 col-sm-12">
+                                                                        <a href="javascript:void(0)" @click="discount = false" class="btn btn-outline-secondary header-button-top" @click="closePayment">
+                                                                            {{ trans('general.cancel') }}
+                                                                        </a>
+                                                                        {!! Form::button(trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success header-button-top']) !!}
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        <el-link class="cursor-pointer text-info" slot="reference" type="primary" v-if="!totals.discount_text">{{ trans('invoices.add_discount') }}</el-link>
+                                                        <el-link slot="reference" type="primary" v-if="totals.discount_text" v-html="totals.discount_text"></el-link>
+                                                    </el-popover>
+                                                </td>
+                                                <td class="text-right border-bottom-0">
+                                                    {{ Form::moneyGroup('discount_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.discount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                                    <span id="discount-total" v-if="totals.discount" v-html="totals.discount"></span>
+                                                    <span v-else>@money(0, $currency->code, true)</span>
+                                                    {!! Form::hidden('discount', null, ['id' => 'discount', 'class' => 'form-control text-right', 'v-model' => 'form.discount']) !!}
+                                                </td>
+                                            </tr>
+                                        @stack('add_discount_td_end')
+                                    @endif
 
                                     @stack('tax_total_td_start')
                                         <tr id="tr-tax">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="6" :colspan="colspan">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
                                                 <strong>{{ trans_choice('general.taxes', 1) }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
@@ -170,7 +177,7 @@
 
                                     @stack('grand_total_td_start')
                                         <tr id="tr-total">
-                                            <td class="text-right border-right-0" colspan="6" :colspan="colspan">
+                                            <td class="text-right border-right-0" colspan="{{ $item_colspan }}" :colspan="colspan">
                                                 <strong>{{ trans('bills.total') }}</strong>
                                             </td>
                                             <td class="text-right long-texts">
diff --git a/resources/views/purchases/bills/edit.blade.php b/resources/views/purchases/bills/edit.blade.php
index 56c29f50a..8be122eb6 100644
--- a/resources/views/purchases/bills/edit.blade.php
+++ b/resources/views/purchases/bills/edit.blade.php
@@ -31,6 +31,7 @@
                     {{ Form::textGroup('order_number', trans('bills.order_number'), 'shopping-cart',[]) }}
 
                     <div class="col-sm-12 mb-4">
+                        @php $item_colspan = in_array(setting('localisation.discount_location', 'total'), ['item', 'both']) ? '6' : '5' @endphp
                         {!! Form::label('items', trans_choice('general.items', 2), ['class' => 'control-label']) !!}
                         <div class="table-responsive overflow-x-scroll overflow-y-hidden">
                             <table class="table table-bordered" id="items">
@@ -52,9 +53,11 @@
                                             <th class="text-right border-right-0 border-bottom-0">{{ trans('bills.price') }}</th>
                                         @stack('price_th_end')
 
-                                        @stack('discount_th_start')
-                                        <th class="text-right border-right-0 border-bottom-0">{{ trans('bills.discount') }}</th>
-                                        @stack('discount_th_end')
+                                        @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
+                                            @stack('discount_th_start')
+                                            <th class="text-right border-right-0 border-bottom-0">{{ trans('bills.discount') }}</th>
+                                            @stack('discount_th_end')
+                                        @endif
 
                                         @stack('taxes_th_start')
                                             <th class="text-right border-right-0 border-bottom-0">{{ trans_choice('general.taxes', 1) }}</th>
@@ -74,13 +77,13 @@
                                                 <button type="button" @click="onAddItem" id="button-add-item" data-toggle="tooltip" title="{{ trans('general.add') }}" class="btn btn-icon btn-outline-success btn-lg" data-original-title="{{ trans('general.add') }}"><i class="fa fa-plus"></i>
                                                 </button>
                                             </td>
-                                            <td class="text-right border-bottom-0" colspan="6" :colspan="colspan"></td>
+                                            <td class="text-right border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan"></td>
                                         </tr>
                                     @stack('add_item_td_end')
 
                                     @stack('sub_total_td_start')
                                         <tr id="tr-subtotal">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="6" :colspan="colspan">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
                                                 <strong>{{ trans('bills.sub_total') }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
@@ -91,61 +94,78 @@
                                         </tr>
                                     @stack('sub_total_td_end')
 
-                                    @stack('add_discount_td_start')
-                                        <tr id="tr-discount">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="6" :colspan="colspan">
-                                                <el-popover
-                                                    popper-class="p-0 h-0"
-                                                    placement="bottom"
-                                                    width="300"
-                                                    v-model="discount">
-                                                    <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="input-group-prepend">
-                                                                            <span class="input-group-text" id="input-discount">
-                                                                                <i class="fa fa-percent"></i>
-                                                                            </span>
+                                    @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
+                                        @stack('item_discount_td_start')
+                                            <tr id="tr-subtotal">
+                                                <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
+                                                    <strong>{{ trans('bills.item_discount') }}</strong>
+                                                </td>
+                                                <td class="text-right border-bottom-0 long-texts">
+                                                    {{ Form::moneyGroup('item_discount', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.item_discount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                                    <span id="item-discount" v-if="totals.item_discount" v-html="totals.item_discount"></span>
+                                                    <span v-else>@money(0, $currency->code, true)</span>
+                                                </td>
+                                            </tr>
+                                        @stack('item_discount_td_end')
+                                    @endif
+
+                                    @if (in_array(setting('localisation.discount_location', 'total'), ['total', 'both']))
+                                        @stack('add_discount_td_start')
+                                            <tr id="tr-discount">
+                                                <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
+                                                    <el-popover
+                                                        popper-class="p-0 h-0"
+                                                        placement="bottom"
+                                                        width="300"
+                                                        v-model="discount">
+                                                        <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="input-group-prepend">
+                                                                                <span class="input-group-text" id="input-discount">
+                                                                                    <i class="fa fa-percent"></i>
+                                                                                </span>
+                                                                            </div>
+                                                                            {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
+                                                                        </div>
+                                                                    </div>
+                                                                    <div class="col-sm-6">
+                                                                        <div class="discount-description">
+                                                                            <strong>{{ trans('bills.discount_desc') }}</strong>
                                                                         </div>
-                                                                        {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-sm-6">
-                                                                    <div class="discount-description">
-                                                                        <strong>{{ trans('invoices.discount_desc') }}</strong>
+                                                            </div>
+                                                            <div class="discount card-footer">
+                                                                <div class="row float-right">
+                                                                    <div class="col-xs-12 col-sm-12">
+                                                                        <a href="javascript:void(0)" @click="discount = false" class="btn btn-outline-secondary header-button-top" @click="closePayment">
+                                                                            {{ trans('general.cancel') }}
+                                                                        </a>
+                                                                        {!! Form::button(trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success header-button-top']) !!}
                                                                     </div>
                                                                 </div>
                                                             </div>
                                                         </div>
-                                                        <div class="discount card-footer">
-                                                            <div class="row float-right">
-                                                                <div class="col-xs-12 col-sm-12">
-                                                                    <a href="javascript:void(0)" @click="discount = false" class="btn btn-outline-secondary header-button-top" @click="closePayment">
-                                                                        {{ trans('general.cancel') }}
-                                                                    </a>
-                                                                    {!! Form::button(trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success header-button-top']) !!}
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                    <el-link class="cursor-pointer text-info" slot="reference" type="primary" v-if="!totals.discount_text">{{ trans('invoices.add_discount') }}</el-link>
-                                                    <el-link slot="reference" type="primary" v-if="totals.discount_text" v-html="totals.discount_text"></el-link>
-                                                </el-popover>
-                                            </td>
-                                            <td class="text-right border-bottom-0">
-                                                {{ Form::moneyGroup('discount_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.discount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
-                                                <span id="discount-total" v-if="totals.discount" v-html="totals.discount"></span>
-                                                <span v-else>@money(0, $currency->code, true)</span>
-                                                {!! Form::hidden('discount', null, ['id' => 'discount', 'class' => 'form-control text-right', 'v-model' => 'form.discount']) !!}
-                                            </td>
-                                        </tr>
-                                    @stack('add_discount_td_end')
+                                                        <el-link class="cursor-pointer text-info" slot="reference" type="primary" v-if="!totals.discount_text">{{ trans('bills.add_discount') }}</el-link>
+                                                        <el-link slot="reference" type="primary" v-if="totals.discount_text" v-html="totals.discount_text"></el-link>
+                                                    </el-popover>
+                                                </td>
+                                                <td class="text-right border-bottom-0">
+                                                    {{ Form::moneyGroup('discount_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.discount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                                    <span id="discount-total" v-if="totals.discount" v-html="totals.discount"></span>
+                                                    <span v-else>@money(0, $currency->code, true)</span>
+                                                    {!! Form::hidden('discount', null, ['id' => 'discount', 'class' => 'form-control text-right', 'v-model' => 'form.discount']) !!}
+                                                </td>
+                                            </tr>
+                                        @stack('add_discount_td_end')
+                                    @endif
 
                                     @stack('tax_total_td_start')
                                         <tr id="tr-tax">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="6" :colspan="colspan">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
                                                 <strong>{{ trans_choice('general.taxes', 1) }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
@@ -158,7 +178,7 @@
 
                                     @stack('grand_total_td_start')
                                         <tr id="tr-total">
-                                            <td class="text-right border-right-0" colspan="6" :colspan="colspan">
+                                            <td class="text-right border-right-0" colspan="{{ $item_colspan }}" :colspan="colspan">
                                                 <strong>{{ trans('bills.total') }}</strong>
                                             </td>
                                             <td class="text-right long-texts">
diff --git a/resources/views/purchases/bills/item.blade.php b/resources/views/purchases/bills/item.blade.php
index 17413efb0..f53a15264 100644
--- a/resources/views/purchases/bills/item.blade.php
+++ b/resources/views/purchases/bills/item.blade.php
@@ -98,36 +98,38 @@
         </td>
     @stack('price_td_end')
 
-    @stack('discount_td_start')
-    <td class="border-right-0 border-bottom-0 w-12"
-        :class="[{'has-error': form.errors.has('items.' + index + '.discount') }]">
-        @stack('discount_input_start')
-        <div class="input-group input-group-merge">
-            <div class="input-group-prepend">
-                    <span class="input-group-text" id="input-discount">
-                        <i class="fa fa-percent"></i>
-                    </span>
-            </div>
-            <input type="number"
-                   max="100"
-                   min="0"
-                   class="form-control text-center"
-                   :name="'items.' + index + '.discount'"
-                   autocomplete="off"
-                   required="required"
-                   data-item="quantity"
-                   v-model="row.discount"
-                   @input="onCalculateTotal"
-                   @change="form.errors.clear('items.' + index + '.discount')">
+    @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
+        @stack('discount_td_start')
+        <td class="border-right-0 border-bottom-0 w-12"
+            :class="[{'has-error': form.errors.has('items.' + index + '.discount') }]">
+            @stack('discount_input_start')
+            <div class="input-group input-group-merge">
+                <div class="input-group-prepend">
+                        <span class="input-group-text" id="input-discount">
+                            <i class="fa fa-percent"></i>
+                        </span>
+                </div>
+                <input type="number"
+                    max="100"
+                    min="0"
+                    class="form-control text-center"
+                    :name="'items.' + index + '.discount'"
+                    autocomplete="off"
+                    required="required"
+                    data-item="quantity"
+                    v-model="row.discount"
+                    @input="onCalculateTotal"
+                    @change="form.errors.clear('items.' + index + '.discount')">
 
-            <div class="invalid-feedback d-block"
-                 v-if="form.errors.has('items.' + index + '.discount')"
-                 v-html="form.errors.get('items.' + index + '.discount')">
+                <div class="invalid-feedback d-block"
+                    v-if="form.errors.has('items.' + index + '.discount')"
+                    v-html="form.errors.get('items.' + index + '.discount')">
+                </div>
             </div>
-        </div>
-        @stack('discount_input_end')
-    </td>
-    @stack('discount_td_end')
+            @stack('discount_input_end')
+        </td>
+        @stack('discount_td_end')
+    @endif
 
     @stack('taxes_td_start')
         <td class="border-right-0 border-bottom-0"
diff --git a/resources/views/purchases/bills/show.blade.php b/resources/views/purchases/bills/show.blade.php
index 050e70ebe..350534836 100644
--- a/resources/views/purchases/bills/show.blade.php
+++ b/resources/views/purchases/bills/show.blade.php
@@ -339,9 +339,11 @@
                                                 <th class="col-sm-3 text-right d-none d-sm-block">{{ trans('bills.price') }}</th>
                                             @stack('price_th_end')
 
-                                            @stack('discount_th_start')
-                                                <th class="col-sm-1 text-center d-none d-sm-block">{{ trans('bills.discount') }}</th>
-                                            @stack('discount_th_end')
+                                            @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
+                                                @stack('discount_th_start')
+                                                    <th class="col-sm-1 text-center d-none d-sm-block">{{ trans('bills.discount') }}</th>
+                                                @stack('discount_th_end')
+                                            @endif
 
                                             @stack('total_th_start')
                                                 <th class="col-xs-4 col-sm-3 text-right pr-5">{{ trans('bills.total') }}</th>
@@ -366,9 +368,11 @@
                                                     <td class="col-sm-3 text-right d-none d-sm-block">@money($bill_item->price, $bill->currency_code, true)</td>
                                                 @stack('price_td_end')
 
-                                                @stack('discount_td_start')
-                                                    <td class="col-sm-1 text-center d-none d-sm-block">{{ $bill_item->discount_rate }}</td>
-                                                @stack('discount_td_end')
+                                                @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
+                                                    @stack('discount_td_start')
+                                                        <td class="col-sm-1 text-center d-none d-sm-block">{{ $bill_item->discount }}</td>
+                                                    @stack('discount_td_end')
+                                                @endif
 
                                                 @stack('total_td_start')
                                                     <td class="col-xs-4 col-sm-3 text-right pr-5">@money($bill_item->total, $bill->currency_code, true)</td>
diff --git a/resources/views/sales/invoices/create.blade.php b/resources/views/sales/invoices/create.blade.php
index c35745c1b..5d3212b6e 100644
--- a/resources/views/sales/invoices/create.blade.php
+++ b/resources/views/sales/invoices/create.blade.php
@@ -30,6 +30,7 @@
                     {{ Form::textGroup('order_number', trans('invoices.order_number'), 'shopping-cart', []) }}
 
                     <div class="col-sm-12 mb-4">
+                        @php $item_colspan = in_array(setting('localisation.discount_location', 'total'), ['item', 'both']) ? '6' : '5' @endphp
                         {!! Form::label('items', trans_choice($text_override['items'], 2), ['class' => 'form-control-label']) !!}
                         <div class="table-responsive overflow-x-scroll overflow-y-hidden">
                             <table class="table table-bordered" id="items">
@@ -51,9 +52,11 @@
                                             <th class="text-right border-right-0 border-bottom-0">{{ trans($text_override['price']) }}</th>
                                         @stack('price_th_end')
 
-                                        @stack('discount_th_start')
-                                            <th class="text-right border-right-0 border-bottom-0">{{ trans('invoices.discount') }}</th>
-                                        @stack('discount_th_end')
+                                        @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
+                                            @stack('discount_th_start')
+                                                <th class="text-right border-right-0 border-bottom-0">{{ trans('invoices.discount') }}</th>
+                                            @stack('discount_th_end')
+                                        @endif
 
                                         @stack('taxes_th_start')
                                             <th class="text-right border-right-0 border-bottom-0">{{ trans_choice('general.taxes', 1) }}</th>
@@ -73,13 +76,13 @@
                                                 <button type="button" @click="onAddItem" id="button-add-item" data-toggle="tooltip" title="{{ trans('general.add') }}" class="btn btn-icon btn-outline-success btn-lg" data-original-title="{{ trans('general.add') }}"><i class="fa fa-plus"></i>
                                                 </button>
                                             </td>
-                                            <td class="text-right border-bottom-0" colspan="6" :colspan="colspan"></td>
+                                            <td class="text-right border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan"></td>
                                         </tr>
                                     @stack('add_item_td_end')
 
                                     @stack('sub_total_td_start')
                                         <tr id="tr-subtotal">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="6" :colspan="colspan">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
                                                 <strong>{{ trans('invoices.sub_total') }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
@@ -90,74 +93,78 @@
                                         </tr>
                                     @stack('sub_total_td_end')
 
-                                    @stack('item_discount_td_start')
-                                        <tr id="tr-subtotal">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="6" :colspan="colspan">
-                                                <strong>{{ trans('invoices.item_discount') }}</strong>
-                                            </td>
-                                            <td class="text-right border-bottom-0 long-texts">
-                                                {{ Form::moneyGroup('item_discount', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.item_discount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
-                                                <span id="item-discount" v-if="totals.item_discount" v-html="totals.item_discount"></span>
-                                                <span v-else>@money(0, $currency->code, true)</span>
-                                            </td>
-                                        </tr>
-                                    @stack('item_discount_td_end')
+                                    @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
+                                        @stack('item_discount_td_start')
+                                            <tr id="tr-subtotal">
+                                                <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
+                                                    <strong>{{ trans('invoices.item_discount') }}</strong>
+                                                </td>
+                                                <td class="text-right border-bottom-0 long-texts">
+                                                    {{ Form::moneyGroup('item_discount', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.item_discount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                                    <span id="item-discount" v-if="totals.item_discount" v-html="totals.item_discount"></span>
+                                                    <span v-else>@money(0, $currency->code, true)</span>
+                                                </td>
+                                            </tr>
+                                        @stack('item_discount_td_end')
+                                    @endif
 
-                                    @stack('add_discount_td_start')
-                                        <tr id="tr-discount">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="6" :colspan="colspan">
-                                                <el-popover
-                                                    popper-class="p-0 h-0"
-                                                    placement="bottom"
-                                                    width="300"
-                                                    v-model="discount">
-                                                    <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="input-group-prepend">
-                                                                            <span class="input-group-text" id="input-discount">
-                                                                                <i class="fa fa-percent"></i>
-                                                                            </span>
+                                    @if (in_array(setting('localisation.discount_location', 'total'), ['total', 'both']))
+                                        @stack('add_discount_td_start')
+                                            <tr id="tr-discount">
+                                                <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
+                                                    <el-popover
+                                                        popper-class="p-0 h-0"
+                                                        placement="bottom"
+                                                        width="300"
+                                                        v-model="discount">
+                                                        <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="input-group-prepend">
+                                                                                <span class="input-group-text" id="input-discount">
+                                                                                    <i class="fa fa-percent"></i>
+                                                                                </span>
+                                                                            </div>
+                                                                            {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
+                                                                        </div>
+                                                                    </div>
+                                                                    <div class="col-sm-6">
+                                                                        <div class="discount-description">
+                                                                            <strong>{{ trans('invoices.discount_desc') }}</strong>
                                                                         </div>
-                                                                        {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-sm-6">
-                                                                    <div class="discount-description">
-                                                                        <strong>{{ trans('invoices.discount_desc') }}</strong>
+                                                            </div>
+                                                            <div class="discount card-footer">
+                                                                <div class="row float-right">
+                                                                    <div class="col-xs-12 col-sm-12">
+                                                                        <a href="javascript:void(0)" @click="discount = false" class="btn btn-outline-secondary header-button-top" @click="closePayment">
+                                                                            {{ trans('general.cancel') }}
+                                                                        </a>
+                                                                        {!! Form::button(trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success header-button-top']) !!}
                                                                     </div>
                                                                 </div>
                                                             </div>
                                                         </div>
-                                                        <div class="discount card-footer">
-                                                            <div class="row float-right">
-                                                                <div class="col-xs-12 col-sm-12">
-                                                                    <a href="javascript:void(0)" @click="discount = false" class="btn btn-outline-secondary header-button-top" @click="closePayment">
-                                                                        {{ trans('general.cancel') }}
-                                                                    </a>
-                                                                    {!! Form::button(trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success header-button-top']) !!}
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                    <el-link class="cursor-pointer text-info" slot="reference" type="primary" v-if="!totals.discount_text">{{ trans('invoices.add_discount') }}</el-link>
-                                                    <el-link slot="reference" type="primary" v-if="totals.discount_text" v-html="totals.discount_text"></el-link>
-                                                </el-popover>
-                                            </td>
-                                            <td class="text-right border-bottom-0">
-                                                {{ Form::moneyGroup('discount_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.discount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
-                                                <span id="discount-total" v-if="totals.discount" v-html="totals.discount"></span>
-                                                <span v-else>@money(0, $currency->code, true)</span>
-                                                {!! Form::hidden('discount', null, ['id' => 'discount', 'class' => 'form-control text-right', 'v-model' => 'form.discount']) !!}
-                                            </td>
-                                        </tr>
-                                    @stack('add_discount_td_end')
+                                                        <el-link class="cursor-pointer text-info" slot="reference" type="primary" v-if="!totals.discount_text">{{ trans('invoices.add_discount') }}</el-link>
+                                                        <el-link slot="reference" type="primary" v-if="totals.discount_text" v-html="totals.discount_text"></el-link>
+                                                    </el-popover>
+                                                </td>
+                                                <td class="text-right border-bottom-0">
+                                                    {{ Form::moneyGroup('discount_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.discount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                                    <span id="discount-total" v-if="totals.discount" v-html="totals.discount"></span>
+                                                    <span v-else>@money(0, $currency->code, true)</span>
+                                                    {!! Form::hidden('discount', null, ['id' => 'discount', 'class' => 'form-control text-right', 'v-model' => 'form.discount']) !!}
+                                                </td>
+                                            </tr>
+                                        @stack('add_discount_td_end')
+                                    @endif
 
                                     @stack('tax_total_td_start')
                                         <tr id="tr-tax">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="6" :colspan="colspan">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
                                                 <strong>{{ trans_choice('general.taxes', 1) }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
@@ -170,7 +177,7 @@
 
                                     @stack('grand_total_td_start')
                                         <tr id="tr-total">
-                                            <td class="text-right border-right-0" colspan="6" :colspan="colspan">
+                                            <td class="text-right border-right-0" colspan="{{ $item_colspan }}" :colspan="colspan">
                                                 <strong>{{ trans('invoices.total') }}</strong>
                                             </td>
                                             <td class="text-right long-texts">
diff --git a/resources/views/sales/invoices/edit.blade.php b/resources/views/sales/invoices/edit.blade.php
index 2af8841d9..793a6dd33 100644
--- a/resources/views/sales/invoices/edit.blade.php
+++ b/resources/views/sales/invoices/edit.blade.php
@@ -31,6 +31,7 @@
                     {{ Form::textGroup('order_number', trans('invoices.order_number'), 'shopping-cart',[]) }}
 
                     <div class="col-sm-12 mb-4">
+                        @php $item_colspan = in_array(setting('localisation.discount_location', 'total'), ['item', 'both']) ? '6' : '5' @endphp
                         {!! Form::label('items', trans_choice($text_override['items'], 2), ['class' => 'control-label']) !!}
                         <div class="table-responsive overflow-x-scroll overflow-y-hidden">
                             <table class="table table-bordered" id="items">
@@ -52,9 +53,11 @@
                                             <th class="text-right border-right-0 border-bottom-0">{{ trans($text_override['price']) }}</th>
                                         @stack('price_th_end')
 
-                                        @stack('discount_th_start')
-                                            <th class="text-right border-right-0 border-bottom-0">{{ trans('invoices.discount') }}</th>
-                                        @stack('discount_th_end')
+                                        @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
+                                            @stack('discount_th_start')
+                                                <th class="text-right border-right-0 border-bottom-0">{{ trans('invoices.discount') }}</th>
+                                            @stack('discount_th_end')
+                                        @endif
 
                                         @stack('taxes_th_start')
                                             <th class="text-right border-right-0 border-bottom-0">{{ trans_choice('general.taxes', 1) }}</th>
@@ -74,13 +77,13 @@
                                                 <button type="button" @click="onAddItem" id="button-add-item" data-toggle="tooltip" title="{{ trans('general.add') }}" class="btn btn-icon btn-outline-success btn-lg" data-original-title="{{ trans('general.add') }}"><i class="fa fa-plus"></i>
                                                 </button>
                                             </td>
-                                            <td class="text-right border-bottom-0" colspan="6" :colspan="colspan"></td>
+                                            <td class="text-right border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan"></td>
                                         </tr>
                                     @stack('add_item_td_end')
 
                                     @stack('sub_total_td_start')
                                         <tr id="tr-subtotal">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="6" :colspan="colspan">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
                                                 <strong>{{ trans('invoices.sub_total') }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
@@ -91,61 +94,78 @@
                                         </tr>
                                     @stack('sub_total_td_end')
 
-                                    @stack('add_discount_td_start')
-                                        <tr id="tr-discount">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="6" :colspan="colspan">
-                                                <el-popover
-                                                    popper-class="p-0 h-0"
-                                                    placement="bottom"
-                                                    width="300"
-                                                    v-model="discount">
-                                                    <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="input-group-prepend">
-                                                                            <span class="input-group-text" id="input-discount">
-                                                                                <i class="fa fa-percent"></i>
-                                                                            </span>
+                                    @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
+                                        @stack('item_discount_td_start')
+                                            <tr id="tr-subtotal">
+                                                <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
+                                                    <strong>{{ trans('invoices.item_discount') }}</strong>
+                                                </td>
+                                                <td class="text-right border-bottom-0 long-texts">
+                                                    {{ Form::moneyGroup('item_discount', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.item_discount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                                    <span id="item-discount" v-if="totals.item_discount" v-html="totals.item_discount"></span>
+                                                    <span v-else>@money(0, $currency->code, true)</span>
+                                                </td>
+                                            </tr>
+                                        @stack('item_discount_td_end')
+                                    @endif
+
+                                    @if (in_array(setting('localisation.discount_location', 'total'), ['total', 'both']))
+                                        @stack('add_discount_td_start')
+                                            <tr id="tr-discount">
+                                                <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
+                                                    <el-popover
+                                                        popper-class="p-0 h-0"
+                                                        placement="bottom"
+                                                        width="300"
+                                                        v-model="discount">
+                                                        <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="input-group-prepend">
+                                                                                <span class="input-group-text" id="input-discount">
+                                                                                    <i class="fa fa-percent"></i>
+                                                                                </span>
+                                                                            </div>
+                                                                            {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
+                                                                        </div>
+                                                                    </div>
+                                                                    <div class="col-sm-6">
+                                                                        <div class="discount-description">
+                                                                            <strong>{{ trans('invoices.discount_desc') }}</strong>
                                                                         </div>
-                                                                        {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-sm-6">
-                                                                    <div class="discount-description">
-                                                                        <strong>{{ trans('invoices.discount_desc') }}</strong>
+                                                            </div>
+                                                            <div class="discount card-footer">
+                                                                <div class="row float-right">
+                                                                    <div class="col-xs-12 col-sm-12">
+                                                                        <a href="javascript:void(0)" @click="discount = false" class="btn btn-outline-secondary header-button-top" @click="closePayment">
+                                                                            {{ trans('general.cancel') }}
+                                                                        </a>
+                                                                        {!! Form::button(trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success header-button-top']) !!}
                                                                     </div>
                                                                 </div>
                                                             </div>
                                                         </div>
-                                                        <div class="discount card-footer">
-                                                            <div class="row float-right">
-                                                                <div class="col-xs-12 col-sm-12">
-                                                                    <a href="javascript:void(0)" @click="discount = false" class="btn btn-outline-secondary header-button-top" @click="closePayment">
-                                                                        {{ trans('general.cancel') }}
-                                                                    </a>
-                                                                    {!! Form::button(trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success header-button-top']) !!}
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                    <el-link class="cursor-pointer text-info" slot="reference" type="primary" v-if="!totals.discount_text">{{ trans('invoices.add_discount') }}</el-link>
-                                                    <el-link slot="reference" type="primary" v-if="totals.discount_text" v-html="totals.discount_text"></el-link>
-                                                </el-popover>
-                                            </td>
-                                            <td class="text-right border-bottom-0">
-                                                {{ Form::moneyGroup('discount_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.discount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
-                                                <span id="discount-total" v-if="totals.discount" v-html="totals.discount"></span>
-                                                <span v-else>@money(0, $currency->code, true)</span>
-                                                {!! Form::hidden('discount', null, ['id' => 'discount', 'class' => 'form-control text-right', 'v-model' => 'form.discount']) !!}
-                                            </td>
-                                        </tr>
-                                    @stack('add_discount_td_end')
+                                                        <el-link class="cursor-pointer text-info" slot="reference" type="primary" v-if="!totals.discount_text">{{ trans('invoices.add_discount') }}</el-link>
+                                                        <el-link slot="reference" type="primary" v-if="totals.discount_text" v-html="totals.discount_text"></el-link>
+                                                    </el-popover>
+                                                </td>
+                                                <td class="text-right border-bottom-0">
+                                                    {{ Form::moneyGroup('discount_total', '', '', ['disabled' => true, 'required' => 'required', 'v-model' => 'totals.discount', 'currency' => $currency, 'masked' => 'true'], 0.00, 'text-right d-none') }}
+                                                    <span id="discount-total" v-if="totals.discount" v-html="totals.discount"></span>
+                                                    <span v-else>@money(0, $currency->code, true)</span>
+                                                    {!! Form::hidden('discount', null, ['id' => 'discount', 'class' => 'form-control text-right', 'v-model' => 'form.discount']) !!}
+                                                </td>
+                                            </tr>
+                                        @stack('add_discount_td_end')
+                                    @endif
 
                                     @stack('tax_total_td_start')
                                         <tr id="tr-tax">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="6" :colspan="colspan">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="{{ $item_colspan }}" :colspan="colspan">
                                                 <strong>{{ trans_choice('general.taxes', 1) }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
@@ -158,7 +178,7 @@
 
                                     @stack('grand_total_td_start')
                                         <tr id="tr-total">
-                                            <td class="text-right border-right-0" colspan="6" :colspan="colspan">
+                                            <td class="text-right border-right-0" colspan="{{ $item_colspan }}" :colspan="colspan">
                                                 <strong>{{ trans('invoices.total') }}</strong>
                                             </td>
                                             <td class="text-right long-texts">
diff --git a/resources/views/sales/invoices/item.blade.php b/resources/views/sales/invoices/item.blade.php
index ea085c498..1083bf0c4 100644
--- a/resources/views/sales/invoices/item.blade.php
+++ b/resources/views/sales/invoices/item.blade.php
@@ -98,36 +98,38 @@
         </td>
     @stack('price_td_end')
 
-    @stack('discount_td_start')
-        <td class="border-right-0 border-bottom-0 w-12"
-            :class="[{'has-error': form.errors.has('items.' + index + '.discount') }]">
-            @stack('discount_input_start')
-            <div class="input-group input-group-merge">
-            <div class="input-group-prepend">
-                    <span class="input-group-text" id="input-discount">
-                        <i class="fa fa-percent"></i>
-                    </span>
-                </div>
-                <input type="number"
-                       max="100"
-                       min="0"
-                       class="form-control text-center"
-                       :name="'items.' + index + '.discount'"
-                       autocomplete="off"
-                       required="required"
-                       data-item="quantity"
-                       v-model="row.discount"
-                       @input="onCalculateTotal"
-                       @change="form.errors.clear('items.' + index + '.discount')">
+    @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
+        @stack('discount_td_start')
+            <td class="border-right-0 border-bottom-0 w-12"
+                :class="[{'has-error': form.errors.has('items.' + index + '.discount') }]">
+                @stack('discount_input_start')
+                <div class="input-group input-group-merge">
+                <div class="input-group-prepend">
+                        <span class="input-group-text" id="input-discount">
+                            <i class="fa fa-percent"></i>
+                        </span>
+                    </div>
+                    <input type="number"
+                        max="100"
+                        min="0"
+                        class="form-control text-center"
+                        :name="'items.' + index + '.discount'"
+                        autocomplete="off"
+                        required="required"
+                        data-item="quantity"
+                        v-model="row.discount"
+                        @input="onCalculateTotal"
+                        @change="form.errors.clear('items.' + index + '.discount')">
 
-                <div class="invalid-feedback d-block"
-                     v-if="form.errors.has('items.' + index + '.discount')"
-                     v-html="form.errors.get('items.' + index + '.discount')">
+                    <div class="invalid-feedback d-block"
+                        v-if="form.errors.has('items.' + index + '.discount')"
+                        v-html="form.errors.get('items.' + index + '.discount')">
+                    </div>
                 </div>
-            </div>
-            @stack('discount_input_end')
-        </td>
-    @stack('discount_td_end')
+                @stack('discount_input_end')
+            </td>
+        @stack('discount_td_end')
+    @endif
 
     @stack('taxes_td_start')
         <td class="border-right-0 border-bottom-0"
diff --git a/resources/views/sales/invoices/show.blade.php b/resources/views/sales/invoices/show.blade.php
index fcbeb9f2b..9ce8e67fe 100644
--- a/resources/views/sales/invoices/show.blade.php
+++ b/resources/views/sales/invoices/show.blade.php
@@ -356,9 +356,11 @@
                                                 <th class="col-sm-3 text-right d-none d-sm-block">{{ trans($text_override['price']) }}</th>
                                             @stack('price_th_end')
 
-                                            @stack('discount_th_start')
-                                                <th class="col-sm-1 text-center d-none d-sm-block">{{ trans('invoices.discount') }}</th>
-                                            @stack('discount_th_end')
+                                            @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
+                                                @stack('discount_th_start')
+                                                    <th class="col-sm-1 text-center d-none d-sm-block">{{ trans('invoices.discount') }}</th>
+                                                @stack('discount_th_end')
+                                            @endif
 
                                             @stack('total_th_start')
                                                 <th class="col-xs-4 col-sm-3 text-right pr-5">{{ trans('invoices.total') }}</th>
@@ -383,9 +385,11 @@
                                                     <td class="col-sm-3 text-right d-none d-sm-block">@money($invoice_item->price, $invoice->currency_code, true)</td>
                                                 @stack('price_td_end')
 
-                                                @stack('discount_td_start')
-                                                    <td class="col-sm-1 text-center d-none d-sm-block">{{ $invoice_item->discount_rate }}</td>
-                                                @stack('discount_td_end')
+                                                @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
+                                                    @stack('discount_td_start')
+                                                        <td class="col-sm-1 text-center d-none d-sm-block">{{ $invoice_item->discount }}</td>
+                                                    @stack('discount_td_end')
+                                                @endif
 
                                                 @stack('total_td_start')
                                                     <td class="col-xs-4 col-sm-3 text-right pr-5">@money($invoice_item->total, $invoice->currency_code, true)</td>
diff --git a/resources/views/settings/localisation/edit.blade.php b/resources/views/settings/localisation/edit.blade.php
index 055205843..1d259817f 100644
--- a/resources/views/settings/localisation/edit.blade.php
+++ b/resources/views/settings/localisation/edit.blade.php
@@ -27,6 +27,8 @@
                 {{ Form::selectGroup('date_separator', trans('settings.localisation.date.separator'), 'minus', $date_separators, $setting['date_separator'], []) }}
 
                 {{ Form::selectGroup('percent_position', trans('settings.localisation.percent.title'), 'percent', $percent_positions, $setting['percent_position'], []) }}
+
+                {{ Form::selectGroup('discount_location', trans('settings.localisation.discount_location.name'), 'percent', $discount_locations, !empty($setting['discount_location']) ? $setting['discount_location'] : 'total', []) }}
             </div>
         </div>