From 5b1306cab46fb7c97a340d82f027149d1b83b3fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Wed, 22 Apr 2020 14:50:30 +0300
Subject: [PATCH] refs #1421

---
 .../assets/js/components/AkauntingModal.vue   |   12 +
 .../js/components/AkauntingModalAddNew.vue    |   10 +
 .../js/components/AkauntingRecurring.vue      |   73 +-
 .../assets/js/components/AkauntingSelect.vue  | 1055 ++++++++++++-----
 .../assets/js/components/AkauntingWidget.vue  |   64 +-
 .../js/components/CreditCard/CardForm.vue     |    2 +
 resources/assets/js/views/purchases/bills.js  |   29 +-
 resources/assets/js/views/sales/invoices.js   |   29 +-
 .../assets/js/views/wizard/currencies.js      |    4 +
 resources/assets/js/views/wizard/taxes.js     |    4 +
 .../sass/core/mixins/_background-variant.scss |   13 -
 .../sass/core/navbars/_navbar-vertical.scss   |    2 +
 resources/lang/bn-BD/install.php              |    2 +-
 resources/lang/de-DE/install.php              |    2 +-
 resources/lang/en-GB/install.php              |    2 +-
 resources/lang/hi-IN/bills.php                |    6 +-
 resources/lang/hi-IN/bulk_actions.php         |    1 +
 resources/lang/hi-IN/install.php              |    1 +
 resources/lang/hi-IN/invoices.php             |    5 +
 resources/lang/hi-IN/settings.php             |    6 +
 resources/lang/hr-HR/bills.php                |    8 +-
 resources/lang/hr-HR/bulk_actions.php         |    6 +-
 resources/lang/hr-HR/general.php              |   14 +-
 resources/lang/hr-HR/install.php              |    1 +
 resources/lang/hr-HR/invoices.php             |    5 +
 resources/lang/hr-HR/messages.php             |    2 +
 resources/lang/hr-HR/passwords.php            |    1 +
 resources/lang/hr-HR/reports.php              |    2 +-
 resources/lang/hr-HR/settings.php             |    6 +
 resources/lang/hr-HR/validation.php           |    7 +-
 resources/lang/hr-HR/widgets.php              |    2 +-
 resources/lang/id-ID/auth.php                 |    1 +
 resources/lang/id-ID/bills.php                |   10 +-
 resources/lang/id-ID/bulk_actions.php         |   22 +-
 resources/lang/id-ID/companies.php            |    5 +-
 resources/lang/id-ID/customers.php            |    2 +-
 resources/lang/id-ID/demo.php                 |   35 +-
 resources/lang/id-ID/email_templates.php      |   22 +-
 resources/lang/id-ID/errors.php               |   26 +-
 resources/lang/id-ID/general.php              |   83 +-
 resources/lang/id-ID/install.php              |    7 +-
 resources/lang/id-ID/invoices.php             |   20 +-
 resources/lang/id-ID/maintenance.php          |    8 +-
 resources/lang/id-ID/messages.php             |    9 +-
 resources/lang/id-ID/modules.php              |   32 +-
 resources/lang/id-ID/pagination.php           |    6 +-
 resources/lang/id-ID/passwords.php            |    1 +
 resources/lang/id-ID/reconciliations.php      |    2 +-
 resources/lang/id-ID/reports.php              |    8 +-
 resources/lang/id-ID/settings.php             |   56 +-
 resources/lang/id-ID/taxes.php                |    2 +-
 resources/lang/id-ID/validation.php           |    7 +-
 resources/lang/it-IT/install.php              |    2 +-
 resources/lang/ja-JP/bills.php                |    9 +-
 resources/lang/ja-JP/bulk_actions.php         |    7 +-
 resources/lang/ja-JP/install.php              |    1 +
 resources/lang/ja-JP/invoices.php             |    5 +
 resources/lang/ja-JP/messages.php             |    2 +
 resources/lang/ja-JP/passwords.php            |    1 +
 resources/lang/ja-JP/settings.php             |    6 +
 resources/lang/ja-JP/validation.php           |    7 +-
 resources/lang/pt-BR/install.php              |    2 +-
 resources/lang/sq-AL/bills.php                |    6 +-
 resources/lang/sq-AL/bulk_actions.php         |    1 +
 resources/lang/sq-AL/install.php              |    1 +
 resources/lang/sq-AL/invoices.php             |    5 +
 resources/lang/sq-AL/settings.php             |    6 +
 resources/lang/tr-TR/email_templates.php      |    2 +-
 resources/lang/tr-TR/install.php              |    2 +-
 resources/views/layouts/admin.blade.php       |    7 +-
 resources/views/partials/admin/menu.blade.php |    5 +-
 .../views/partials/portal/menu.blade.php      |    5 +-
 .../partials/reports/table/rows.blade.php     |    2 +-
 .../views/partials/wizard/content.blade.php   |    2 +-
 .../views/portal/invoices/show.blade.php      |    2 +-
 .../views/portal/invoices/signed.blade.php    |    2 +-
 .../views/purchases/bills/create.blade.php    |    2 +-
 .../views/purchases/bills/edit.blade.php      |    2 +-
 .../views/purchases/bills/print.blade.php     |    2 +-
 .../views/purchases/bills/show.blade.php      |    4 +-
 .../views/sales/invoices/create.blade.php     |    2 +-
 resources/views/sales/invoices/edit.blade.php |    4 +-
 .../sales/invoices/print_classic.blade.php    |    4 +-
 .../sales/invoices/print_default.blade.php    |    2 +-
 .../sales/invoices/print_modern.blade.php     |    2 +-
 resources/views/sales/invoices/show.blade.php |    4 +-
 86 files changed, 1244 insertions(+), 614 deletions(-)

diff --git a/resources/assets/js/components/AkauntingModal.vue b/resources/assets/js/components/AkauntingModal.vue
index 16ce46188..776ecaaa0 100644
--- a/resources/assets/js/components/AkauntingModal.vue
+++ b/resources/assets/js/components/AkauntingModal.vue
@@ -96,6 +96,14 @@ export default {
         };
     },
 
+    created: function () {	
+        if (this.show) {	
+            let documentClasses = document.body.classList;
+
+            documentClasses.add("modal-open");	
+        }	
+    },
+
     methods: {
         closeModal() {
             this.$emit("update:show", false);
@@ -109,6 +117,10 @@ export default {
         },
 
         onCancel() {
+            let documentClasses = document.body.classList;	
+
+            documentClasses.remove("modal-open");
+
             this.$emit("cancel");
         }
     },
diff --git a/resources/assets/js/components/AkauntingModalAddNew.vue b/resources/assets/js/components/AkauntingModalAddNew.vue
index b64a47d69..e87bbb93e 100644
--- a/resources/assets/js/components/AkauntingModalAddNew.vue
+++ b/resources/assets/js/components/AkauntingModalAddNew.vue
@@ -130,6 +130,12 @@ export default {
         };
     },
 
+    created: function () {	
+        let documentClasses = document.body.classList;	
+
+        documentClasses.add("modal-open");	
+    },
+
     mounted() {
         if (this.is_component) {
             this.component = Vue.component('add-new-component', (resolve, reject) => {
@@ -230,6 +236,10 @@ export default {
         },
 
         onCancel() {
+            let documentClasses = document.body.classList;
+
+            documentClasses.remove("modal-open");
+
             this.$emit("cancel");
         }
     },
diff --git a/resources/assets/js/components/AkauntingRecurring.vue b/resources/assets/js/components/AkauntingRecurring.vue
index 58a97de4f..5a29a0711 100644
--- a/resources/assets/js/components/AkauntingRecurring.vue
+++ b/resources/assets/js/components/AkauntingRecurring.vue
@@ -1,9 +1,9 @@
 <template>
     <div class="row col-md-6 pr-0">
         <base-input :label="title"
-                name="recurring_frequency"
-                :class="frequencyClasses"
-                :error="frequencyError">
+            name="recurring_frequency"
+            :class="frequencyClasses"
+            :error="frequencyError">
             <el-select v-model="recurring_frequency" @input="change" filterable
                 :placeholder="placeholder">
                 <template slot="prefix">
@@ -21,22 +21,21 @@
         </base-input>
 
         <base-input :label="''"
-                name="recurring_interval"
-                type="number"
-                :value="0"
-                class="recurring-single"
-                :class="invertalClasses"
-                :error="intervalError"
-                v-model="recurring_interval"
-                >
+            name="recurring_interval"
+            type="number"
+            :value="0"
+            class="recurring-single"
+            :class="invertalClasses"
+            :error="intervalError"
+            v-model="recurring_interval"
+            >
         </base-input>
 
         <base-input :label="''"
-                name="recurring_custom_frequency"
-                class="recurring-single"
-                :class="customFrequencyClasses"
-                :error="customFrequencyError"
-                >
+            name="recurring_custom_frequency"
+            class="recurring-single"
+            :class="customFrequencyClasses"
+            :error="customFrequencyError">
             <el-select v-model="recurring_custom_frequency" @input="change" filterable
                 :placeholder="placeholder">
                 <el-option v-for="(label, value) in customFrequencyOptions"
@@ -48,14 +47,13 @@
         </base-input>
 
         <base-input :label="''"
-                name="recurring_count"
-                type="number"
-                :value="0"
-                class="recurring-single"
-                :class="countClasses"
-                :error="countError"
-                v-model="recurring_count"
-                >
+            name="recurring_count"
+            type="number"
+            :value="0"
+            class="recurring-single"
+            :class="countClasses"
+            :error="countError"
+            v-model="recurring_count">
         </base-input>
     </div>
 </template>
@@ -89,14 +87,22 @@ export default {
         frequencyValue: null,
         frequencyError: null,
 
-        intervalValue: null,
+        intervalValue: {
+            type: [Number, String],	
+            default: 0,	
+            description: "Default interval value"	
+        },
         intervalError: null,
 
         customFrequencyOptions: null,
         customFrequencyValue: null,
         customFrequencyError: null,
 
-        countValue: null,
+        countValue: {
+            type: [Number, String],	
+            default: 0,	
+            description: "Default count value"	
+        },
         countError: null,
 
         icon: {
@@ -107,10 +113,10 @@ export default {
 
     data() {
         return {
-            recurring_frequency: this.frequencyValue,
-            recurring_interval: this.intervalValue,
-            recurring_custom_frequency: this.customFrequencyValue,
-            recurring_count: this.countValue,
+            recurring_frequency: null,
+            recurring_interval: null,
+            recurring_custom_frequency: null,
+            recurring_count: null,
             frequencyClasses: 'col-md-12',
             invertalClasses: 'col-md-2 d-none',
             customFrequencyClasses: 'col-md-4 d-none',
@@ -118,6 +124,13 @@ export default {
         }
     },
 
+    created() {	
+        this.recurring_frequency = this.frequencyValue;	
+        this.recurring_interval = this.intervalValue;	
+        this.recurring_custom_frequency = this.customFrequencyValue;	
+        this.recurring_count = this.countValue;	
+    },
+
     mounted() {
         this.recurring_frequency = this.frequencyValue;
 
diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue
index 6e17406fa..836ee4c53 100644
--- a/resources/assets/js/components/AkauntingSelect.vue
+++ b/resources/assets/js/components/AkauntingSelect.vue
@@ -10,379 +10,763 @@
             formClasses
         ]"
         :error="formError">
+        <span v-if="Array.isArray(selectOptions)">
+            <el-select v-model="real_model" @input="change" :disabled="disabled" filterable v-if="(disabled) && !multiple && !collapse"
+                :placeholder="placeholder">
+                <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
+                    <p class="el-select-dropdown__empty">
+                        {{ noMatchingDataText }}
+                    </p>
+                    <ul class="el-scrollbar__view el-select-dropdown__list">
+                        <li class="el-select-dropdown__item el-select__footer">
+                            <div @click="onAddItem">
+                                <i class="fas fa-plus"></i>
+                                <span>
+                                    {{ add_new_text }}
+                                </span>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
 
-        <el-select v-model="real_model" @input="change" :disabled="disabled" filterable v-if="(disabled) && !multiple && !collapse"
-            :placeholder="placeholder">
-            <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
-                <p class="el-select-dropdown__empty">
-                    {{ noMatchingDataText }}
-                </p>
-                <ul class="el-scrollbar__view el-select-dropdown__list">
-                    <li class="el-select-dropdown__item el-select__footer">
-                        <div @click="onAddItem">
-                            <i class="fas fa-plus"></i>
-                            <span>
-                                {{ add_new_text }}
-                            </span>
-                        </div>
-                    </li>
-                </ul>
-            </div>
+                <div v-else-if="addNew.status && options.length == 0" slot="empty">
+                    <p class="el-select-dropdown__empty">
+                        {{ noDataText }}
+                    </p>
+                    <ul class="el-scrollbar__view el-select-dropdown__list">
+                        <li class="el-select-dropdown__item el-select__footer">
+                            <div @click="onAddItem">
+                                <i class="fas fa-plus"></i>
+                                <span>
+                                    {{ add_new_text }}
+                                </span>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
 
-            <div v-else-if="addNew.status && options.length == 0" slot="empty">
-                <p class="el-select-dropdown__empty">
-                    {{ noDataText }}
-                </p>
-                <ul class="el-scrollbar__view el-select-dropdown__list">
-                    <li class="el-select-dropdown__item el-select__footer">
-                        <div @click="onAddItem">
-                            <i class="fas fa-plus"></i>
-                            <span>
-                                {{ add_new_text }}
-                            </span>
-                        </div>
-                    </li>
-                </ul>
-            </div>
+                <template slot="prefix">
+                    <span class="el-input__suffix-inner el-select-icon">
+                        <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
+                    </span>
+                </template>
 
-            <template slot="prefix">
-                <span class="el-input__suffix-inner el-select-icon">
-                    <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
-                </span>
-            </template>
+                <el-option v-if="!group" v-for="(option, key) in selectOptions"
+                :key="key"
+                :label="option.value"
+                :value="option.key">
+                    <span class="float-left">{{ option.value }}</span>
+                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[option.key]">{{ new_text }}</span>
+                </el-option>
 
-            <el-option v-if="!group" v-for="(label, value) in selectOptions"
-               :key="value"
-               :label="label"
-               :value="value">
-                <span class="float-left">{{ label }}</span>
-                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-            </el-option>
+                <!-- Todo sortable -->
+                <el-option-group
+                    v-if="group"
+                    v-for="(options, name) in selectOptions"
+                    :key="name"
+                    :label="name">
+                    <el-option
+                        v-for="(label, value) in options"
+                        :key="value"
+                        :label="label"
+                        :value="value">
+                        <span class="float-left">{{ label }}</span>
+                        <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
+                    </el-option>
+                </el-option-group>
 
-            <el-option-group
-                v-if="group"
-                v-for="(options, name) in selectOptions"
-                :key="name"
-                :label="name">
-                <el-option
-                    v-for="(label, value) in options"
+                <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true"  :value="add_new">
+                    <div @click="onAddItem">
+                        <i class="fas fa-plus"></i>
+                        <span>
+                            {{ add_new_text }}
+                        </span>
+                    </div>
+                </el-option>
+            </el-select>
+
+            <el-select v-model="real_model" @input="change" :disabled="disabled" filterable v-if="!disabled && !multiple"
+                :placeholder="placeholder">
+                <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
+                    <p class="el-select-dropdown__empty">
+                        {{ noMatchingDataText }}
+                    </p>
+                    <ul class="el-scrollbar__view el-select-dropdown__list">
+                        <li class="el-select-dropdown__item el-select__footer">
+                            <div @click="onAddItem">
+                                <i class="fas fa-plus"></i>
+                                <span>
+                                    {{ add_new_text }}
+                                </span>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+
+                <div v-else-if="addNew.status && options.length == 0" slot="empty">
+                    <p class="el-select-dropdown__empty">
+                        {{ noDataText }}
+                    </p>
+                    <ul class="el-scrollbar__view el-select-dropdown__list">
+                        <li class="el-select-dropdown__item el-select__footer">
+                            <div @click="onAddItem">
+                                <i class="fas fa-plus"></i>
+                                <span>
+                                    {{ add_new_text }}
+                                </span>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+
+                <template slot="prefix">
+                    <span class="el-input__suffix-inner el-select-icon">
+                        <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
+                    </span>
+                </template>
+
+                <el-option v-if="!group" v-for="(option, key) in selectOptions"
+                :key="key"
+                :label="option.value"
+                :value="option.key">
+                    <span class="float-left">{{ option.value }}</span>
+                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[option.key]">{{ new_text }}</span>
+                </el-option>
+
+                <el-option-group
+                    v-if="group"
+                    v-for="(options, name) in selectOptions"
+                    :key="name"
+                    :label="name">
+                    <el-option
+                        v-for="(label, value) in options"
+                        :key="value"
+                        :label="label"
+                        :value="value">
+                        <span class="float-left">{{ label }}</span>
+                        <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
+                    </el-option>
+                </el-option-group>
+
+                <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
+                    <div @click="onAddItem">
+                        <i class="fas fa-plus"></i>
+                        <span>
+                            {{ add_new_text }}
+                        </span>
+                    </div>
+                </el-option>
+            </el-select>
+
+            <el-select v-model="real_model" @input="change" filterable v-if="!disabled && multiple && !collapse" multiple
+                :placeholder="placeholder">
+                <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
+                    <p class="el-select-dropdown__empty">
+                        {{ noMatchingDataText }}
+                    </p>
+                    <ul class="el-scrollbar__view el-select-dropdown__list">
+                        <li class="el-select-dropdown__item el-select__footer">
+                            <div @click="onAddItem">
+                                <i class="fas fa-plus"></i>
+                                <span>
+                                    {{ add_new_text }}
+                                </span>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+
+                <div v-else-if="addNew.status && options.length == 0" slot="empty">
+                    <p class="el-select-dropdown__empty">
+                        {{ noDataText }}
+                    </p>
+                    <ul class="el-scrollbar__view el-select-dropdown__list">
+                        <li class="el-select-dropdown__item el-select__footer">
+                            <div @click="onAddItem">
+                                <i class="fas fa-plus"></i>
+                                <span>
+                                    {{ add_new_text }}
+                                </span>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+
+                <template slot="prefix">
+                    <span class="el-input__suffix-inner el-select-icon">
+                        <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
+                    </span>
+                </template>
+
+                <el-option v-if="!group" v-for="(option, key) in selectOptions"
+                :key="key"
+                :label="option.value"
+                :value="option.key">
+                    <span class="float-left">{{ option.value }}</span>
+                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[option.key]">{{ new_text }}</span>
+                </el-option>
+
+                <!-- Todo sortable -->
+                <el-option-group
+                    v-if="group"
+                    v-for="(options, name) in selectOptions"
+                    :key="name"
+                    :label="name">
+                    <el-option
+                        v-for="(label, value) in options"
+                        :key="value"
+                        :label="label"
+                        :value="value">
+                        <span class="float-left">{{ label }}</span>
+                        <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
+                    </el-option>
+                </el-option-group>
+
+                <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
+                    <div @click="onAddItem">
+                        <i class="fas fa-plus"></i>
+                        <span>
+                            {{ add_new_text }}
+                        </span>
+                    </div>
+                </el-option>
+            </el-select>
+
+            <el-select v-model="real_model" @input="change" filterable disabled v-if="disabled && multiple && !collapse" multiple
+                :placeholder="placeholder">
+                <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
+                    <p class="el-select-dropdown__empty">
+                        {{ noMatchingDataText }}
+                    </p>
+                    <ul class="el-scrollbar__view el-select-dropdown__list">
+                        <li class="el-select-dropdown__item el-select__footer">
+                            <div @click="onAddItem">
+                                <i class="fas fa-plus"></i>
+                                <span>
+                                    {{ add_new_text }}
+                                </span>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+
+                <div v-else-if="addNew.status && options.length == 0" slot="empty">
+                    <p class="el-select-dropdown__empty">
+                        {{ noDataText }}
+                    </p>
+                    <ul class="el-scrollbar__view el-select-dropdown__list">
+                        <li class="el-select-dropdown__item el-select__footer">
+                            <div @click="onAddItem">
+                                <i class="fas fa-plus"></i>
+                                <span>
+                                    {{ add_new_text }}
+                                </span>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+
+                <template slot="prefix">
+                    <span class="el-input__suffix-inner el-select-icon">
+                        <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
+                    </span>
+                </template>
+
+                <el-option v-if="!group" v-for="(option, key) in selectOptions"
+                :key="key"
+                :label="option.value"
+                :value="option.key">
+                    <span class="float-left">{{ option.value }}</span>
+                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[option.key]">{{ new_text }}</span>
+                </el-option>
+
+                <!-- Todo sortable -->
+                <el-option-group
+                    v-if="group"
+                    v-for="(options, name) in selectOptions"
+                    :key="name"
+                    :label="name">
+                    <el-option
+                        v-for="(label, value) in options"
+                        :key="value"
+                        :label="label"
+                        :value="value">
+                        <span class="float-left">{{ label }}</span>
+                        <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
+                    </el-option>
+                </el-option-group>
+
+                <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
+                    <div @click="onAddItem">
+                        <i class="fas fa-plus"></i>
+                        <span>
+                            {{ add_new_text }}
+                        </span>
+                    </div>
+                </el-option>
+            </el-select>
+
+            <el-select v-model="real_model" @input="change" filterable v-if="!disabled && multiple && collapse" multiple collapse-tags
+                :placeholder="placeholder">
+                <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
+                    <p class="el-select-dropdown__empty">
+                        {{ noMatchingDataText }}
+                    </p>
+                    <ul class="el-scrollbar__view el-select-dropdown__list">
+                        <li class="el-select-dropdown__item el-select__footer">
+                            <div @click="onAddItem">
+                                <i class="fas fa-plus"></i>
+                                <span>
+                                    {{ add_new_text }}
+                                </span>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+
+                <div v-else-if="addNew.status && options.length == 0" slot="empty">
+                    <p class="el-select-dropdown__empty">
+                        {{ noDataText }}
+                    </p>
+                    <ul class="el-scrollbar__view el-select-dropdown__list">
+                        <li class="el-select-dropdown__item el-select__footer">
+                            <div @click="onAddItem">
+                                <i class="fas fa-plus"></i>
+                                <span>
+                                    {{ add_new_text }}
+                                </span>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+
+                <template slot="prefix">
+                    <span class="el-input__suffix-inner el-select-icon">
+                        <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
+                    </span>
+                </template>
+
+                <el-option v-if="!group" v-for="(option, key) in selectOptions"
+                :key="key"
+                :label="option.value"
+                :value="option.key">
+                    <span class="float-left">{{ option.value }}</span>
+                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[option.key]">{{ new_text }}</span>
+                </el-option>
+
+                <!-- Todo sortable -->
+                <el-option-group
+                    v-if="group"
+                    v-for="(options, name) in selectOptions"
+                    :key="name"
+                    :label="name">
+                    <el-option
+                        v-for="(label, value) in options"
+                        :key="value"
+                        :label="label"
+                        :value="value">
+                        <span class="float-left">{{ label }}</span>
+                        <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
+                    </el-option>
+                </el-option-group>
+
+                <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
+                    <div @click="onAddItem">
+                        <i class="fas fa-plus"></i>
+                        <span>
+                            {{ add_new_text }}
+                        </span>
+                    </div>
+                </el-option>
+            </el-select>
+
+            <component v-bind:is="add_new_html" @submit="onSubmit" @cancel="onCancel"></component>
+
+            <span slot="infoBlock" class="badge badge-success badge-resize float-right" v-if="new_options[real_model]">{{ new_text }}</span>
+
+            <select :name="name" v-model="real_model" class="d-none">
+                <option v-for="(label, value) in selectOptions" :key="value" :value="value">{{ label }}</option>
+            </select>
+        </span>
+
+        <span v-else>
+            <el-select v-model="real_model" @input="change" :disabled="disabled" filterable v-if="(disabled) && !multiple && !collapse"
+                :placeholder="placeholder">
+                <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
+                    <p class="el-select-dropdown__empty">
+                        {{ noMatchingDataText }}
+                    </p>
+                    <ul class="el-scrollbar__view el-select-dropdown__list">
+                        <li class="el-select-dropdown__item el-select__footer">
+                            <div @click="onAddItem">
+                                <i class="fas fa-plus"></i>
+                                <span>
+                                    {{ add_new_text }}
+                                </span>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+
+                <div v-else-if="addNew.status && options.length == 0" slot="empty">
+                    <p class="el-select-dropdown__empty">
+                        {{ noDataText }}
+                    </p>
+                    <ul class="el-scrollbar__view el-select-dropdown__list">
+                        <li class="el-select-dropdown__item el-select__footer">
+                            <div @click="onAddItem">
+                                <i class="fas fa-plus"></i>
+                                <span>
+                                    {{ add_new_text }}
+                                </span>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+
+                <template slot="prefix">
+                    <span class="el-input__suffix-inner el-select-icon">
+                        <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
+                    </span>
+                </template>
+
+                <el-option v-if="!group" v-for="(label, value) in selectOptions"
                     :key="value"
                     :label="label"
                     :value="value">
                     <span class="float-left">{{ label }}</span>
                     <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
                 </el-option>
-            </el-option-group>
 
-            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true"  :value="add_new">
-                <div @click="onAddItem">
-                    <i class="fas fa-plus"></i>
-                    <span>
-                        {{ add_new_text }}
-                    </span>
+                <!-- Todo sortable -->
+                <el-option-group
+                    v-if="group"
+                    v-for="(options, name) in selectOptions"
+                    :key="name"
+                    :label="name">
+                    <el-option
+                        v-for="(label, value) in options"
+                        :key="value"
+                        :label="label"
+                        :value="value">
+                        <span class="float-left">{{ label }}</span>
+                        <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
+                    </el-option>
+                </el-option-group>
+
+                <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true"  :value="add_new">
+                    <div @click="onAddItem">
+                        <i class="fas fa-plus"></i>
+                        <span>
+                            {{ add_new_text }}
+                        </span>
+                    </div>
+                </el-option>
+            </el-select>
+
+            <el-select v-model="real_model" @input="change" filterable v-if="!Array.isArray(selectOptions) && !disabled && !multiple"
+                :placeholder="placeholder">
+                <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
+                    <p class="el-select-dropdown__empty">
+                        {{ noMatchingDataText }}
+                    </p>
+                    <ul class="el-scrollbar__view el-select-dropdown__list">
+                        <li class="el-select-dropdown__item el-select__footer">
+                            <div @click="onAddItem">
+                                <i class="fas fa-plus"></i>
+                                <span>
+                                    {{ add_new_text }}
+                                </span>
+                            </div>
+                        </li>
+                    </ul>
                 </div>
-            </el-option>
-        </el-select>
 
-        <el-select v-model="real_model" @input="change" filterable v-if="!disabled && !multiple"
-            :placeholder="placeholder">
-            <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
-                <p class="el-select-dropdown__empty">
-                    {{ noMatchingDataText }}
-                </p>
-                <ul class="el-scrollbar__view el-select-dropdown__list">
-                    <li class="el-select-dropdown__item el-select__footer">
-                        <div @click="onAddItem">
-                            <i class="fas fa-plus"></i>
-                            <span>
-                                {{ add_new_text }}
-                            </span>
-                        </div>
-                    </li>
-                </ul>
-            </div>
+                <div v-else-if="addNew.status && options.length == 0" slot="empty">
+                    <p class="el-select-dropdown__empty">
+                        {{ noDataText }}
+                    </p>
+                    <ul class="el-scrollbar__view el-select-dropdown__list">
+                        <li class="el-select-dropdown__item el-select__footer">
+                            <div @click="onAddItem">
+                                <i class="fas fa-plus"></i>
+                                <span>
+                                    {{ add_new_text }}
+                                </span>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
 
-            <div v-else-if="addNew.status && options.length == 0" slot="empty">
-                <p class="el-select-dropdown__empty">
-                    {{ noDataText }}
-                </p>
-                <ul class="el-scrollbar__view el-select-dropdown__list">
-                    <li class="el-select-dropdown__item el-select__footer">
-                        <div @click="onAddItem">
-                            <i class="fas fa-plus"></i>
-                            <span>
-                                {{ add_new_text }}
-                            </span>
-                        </div>
-                    </li>
-                </ul>
-            </div>
+                <template slot="prefix">
+                    <span class="el-input__suffix-inner el-select-icon">
+                        <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
+                    </span>
+                </template>
 
-            <template slot="prefix">
-                <span class="el-input__suffix-inner el-select-icon">
-                    <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
-                </span>
-            </template>
-
-            <el-option v-if="!group" v-for="(label, value) in selectOptions"
-               :key="value"
-               :label="label"
-               :value="value">
-                <span class="float-left">{{ label }}</span>
-                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-            </el-option>
-
-            <el-option-group
-                v-if="group"
-                v-for="(options, name) in selectOptions"
-                :key="name"
-                :label="name">
-                <el-option
-                    v-for="(label, value) in options"
+                <el-option v-if="!group" v-for="(label, value) in selectOptions"
                     :key="value"
                     :label="label"
                     :value="value">
                     <span class="float-left">{{ label }}</span>
                     <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
                 </el-option>
-            </el-option-group>
 
-            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
-                <div @click="onAddItem">
-                    <i class="fas fa-plus"></i>
-                    <span>
-                        {{ add_new_text }}
-                    </span>
+                <el-option-group
+                    v-if="group"
+                    v-for="(options, name) in selectOptions"
+                    :key="name"
+                    :label="name">
+                    <el-option
+                        v-for="(label, value) in options"
+                        :key="value"
+                        :label="label"
+                        :value="value">
+                        <span class="float-left">{{ label }}</span>
+                        <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
+                    </el-option>
+                </el-option-group>
+
+                <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
+                    <div @click="onAddItem">
+                        <i class="fas fa-plus"></i>
+                        <span>
+                            {{ add_new_text }}
+                        </span>
+                    </div>
+                </el-option>
+            </el-select>
+
+            <el-select v-model="real_model" @input="change" filterable v-if="!disabled && multiple && !collapse" multiple
+                :placeholder="placeholder">
+                <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
+                    <p class="el-select-dropdown__empty">
+                        {{ noMatchingDataText }}
+                    </p>
+                    <ul class="el-scrollbar__view el-select-dropdown__list">
+                        <li class="el-select-dropdown__item el-select__footer">
+                            <div @click="onAddItem">
+                                <i class="fas fa-plus"></i>
+                                <span>
+                                    {{ add_new_text }}
+                                </span>
+                            </div>
+                        </li>
+                    </ul>
                 </div>
-            </el-option>
-        </el-select>
 
-        <el-select v-model="real_model" @input="change" filterable v-if="!disabled && multiple && !collapse" multiple
-            :placeholder="placeholder">
-            <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
-                <p class="el-select-dropdown__empty">
-                    {{ noMatchingDataText }}
-                </p>
-                <ul class="el-scrollbar__view el-select-dropdown__list">
-                    <li class="el-select-dropdown__item el-select__footer">
-                        <div @click="onAddItem">
-                            <i class="fas fa-plus"></i>
-                            <span>
-                                {{ add_new_text }}
-                            </span>
-                        </div>
-                    </li>
-                </ul>
-            </div>
+                <div v-else-if="addNew.status && options.length == 0" slot="empty">
+                    <p class="el-select-dropdown__empty">
+                        {{ noDataText }}
+                    </p>
+                    <ul class="el-scrollbar__view el-select-dropdown__list">
+                        <li class="el-select-dropdown__item el-select__footer">
+                            <div @click="onAddItem">
+                                <i class="fas fa-plus"></i>
+                                <span>
+                                    {{ add_new_text }}
+                                </span>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
 
-            <div v-else-if="addNew.status && options.length == 0" slot="empty">
-                <p class="el-select-dropdown__empty">
-                    {{ noDataText }}
-                </p>
-                <ul class="el-scrollbar__view el-select-dropdown__list">
-                    <li class="el-select-dropdown__item el-select__footer">
-                        <div @click="onAddItem">
-                            <i class="fas fa-plus"></i>
-                            <span>
-                                {{ add_new_text }}
-                            </span>
-                        </div>
-                    </li>
-                </ul>
-            </div>
+                <template slot="prefix">
+                    <span class="el-input__suffix-inner el-select-icon">
+                        <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
+                    </span>
+                </template>
 
-            <template slot="prefix">
-                <span class="el-input__suffix-inner el-select-icon">
-                    <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
-                </span>
-            </template>
-
-            <el-option v-if="!group" v-for="(label, value) in selectOptions"
-               :key="value"
-               :label="label"
-               :value="value">
-                <span class="float-left">{{ label }}</span>
-                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-            </el-option>
-
-            <el-option-group
-                v-if="group"
-                v-for="(options, name) in selectOptions"
-                :key="name"
-                :label="name">
-                <el-option
-                    v-for="(label, value) in options"
+                <el-option v-if="!group" v-for="(label, value) in selectOptions"
                     :key="value"
                     :label="label"
                     :value="value">
                     <span class="float-left">{{ label }}</span>
                     <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
                 </el-option>
-            </el-option-group>
 
-            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
-                <div @click="onAddItem">
-                    <i class="fas fa-plus"></i>
-                    <span>
-                        {{ add_new_text }}
-                    </span>
+                <!-- Todo sortable -->
+                <el-option-group
+                    v-if="group"
+                    v-for="(options, name) in selectOptions"
+                    :key="name"
+                    :label="name">
+                    <el-option
+                        v-for="(label, value) in options"
+                        :key="value"
+                        :label="label"
+                        :value="value">
+                        <span class="float-left">{{ label }}</span>
+                        <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
+                    </el-option>
+                </el-option-group>
+
+                <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
+                    <div @click="onAddItem">
+                        <i class="fas fa-plus"></i>
+                        <span>
+                            {{ add_new_text }}
+                        </span>
+                    </div>
+                </el-option>
+            </el-select>
+
+            <el-select v-model="real_model" @input="change" filterable disabled v-if="disabled && multiple && !collapse" multiple
+                :placeholder="placeholder">
+                <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
+                    <p class="el-select-dropdown__empty">
+                        {{ noMatchingDataText }}
+                    </p>
+                    <ul class="el-scrollbar__view el-select-dropdown__list">
+                        <li class="el-select-dropdown__item el-select__footer">
+                            <div @click="onAddItem">
+                                <i class="fas fa-plus"></i>
+                                <span>
+                                    {{ add_new_text }}
+                                </span>
+                            </div>
+                        </li>
+                    </ul>
                 </div>
-            </el-option>
-        </el-select>
 
-        <el-select v-model="real_model" @input="change" filterable disabled v-if="disabled && multiple && !collapse" multiple
-            :placeholder="placeholder">
-            <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
-                <p class="el-select-dropdown__empty">
-                    {{ noMatchingDataText }}
-                </p>
-                <ul class="el-scrollbar__view el-select-dropdown__list">
-                    <li class="el-select-dropdown__item el-select__footer">
-                        <div @click="onAddItem">
-                            <i class="fas fa-plus"></i>
-                            <span>
-                                {{ add_new_text }}
-                            </span>
-                        </div>
-                    </li>
-                </ul>
-            </div>
+                <div v-else-if="addNew.status && options.length == 0" slot="empty">
+                    <p class="el-select-dropdown__empty">
+                        {{ noDataText }}
+                    </p>
+                    <ul class="el-scrollbar__view el-select-dropdown__list">
+                        <li class="el-select-dropdown__item el-select__footer">
+                            <div @click="onAddItem">
+                                <i class="fas fa-plus"></i>
+                                <span>
+                                    {{ add_new_text }}
+                                </span>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
 
-            <div v-else-if="addNew.status && options.length == 0" slot="empty">
-                <p class="el-select-dropdown__empty">
-                    {{ noDataText }}
-                </p>
-                <ul class="el-scrollbar__view el-select-dropdown__list">
-                    <li class="el-select-dropdown__item el-select__footer">
-                        <div @click="onAddItem">
-                            <i class="fas fa-plus"></i>
-                            <span>
-                                {{ add_new_text }}
-                            </span>
-                        </div>
-                    </li>
-                </ul>
-            </div>
+                <template slot="prefix">
+                    <span class="el-input__suffix-inner el-select-icon">
+                        <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
+                    </span>
+                </template>
 
-            <template slot="prefix">
-                <span class="el-input__suffix-inner el-select-icon">
-                    <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
-                </span>
-            </template>
-
-            <el-option v-if="!group" v-for="(label, value) in selectOptions"
-               :key="value"
-               :label="label"
-               :value="value">
-                <span class="float-left">{{ label }}</span>
-                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-            </el-option>
-
-            <el-option-group
-                v-if="group"
-                v-for="(options, name) in selectOptions"
-                :key="name"
-                :label="name">
-                <el-option
-                    v-for="(label, value) in options"
+                <el-option v-if="!group" v-for="(label, value) in selectOptions"
                     :key="value"
                     :label="label"
                     :value="value">
                     <span class="float-left">{{ label }}</span>
                     <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
                 </el-option>
-            </el-option-group>
 
-            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
-                <div @click="onAddItem">
-                    <i class="fas fa-plus"></i>
-                    <span>
-                        {{ add_new_text }}
-                    </span>
+                <!-- Todo sortable -->
+                <el-option-group
+                    v-if="group"
+                    v-for="(options, name) in selectOptions"
+                    :key="name"
+                    :label="name">
+                    <el-option
+                        v-for="(label, value) in options"
+                        :key="value"
+                        :label="label"
+                        :value="value">
+                        <span class="float-left">{{ label }}</span>
+                        <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
+                    </el-option>
+                </el-option-group>
+
+                <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
+                    <div @click="onAddItem">
+                        <i class="fas fa-plus"></i>
+                        <span>
+                            {{ add_new_text }}
+                        </span>
+                    </div>
+                </el-option>
+            </el-select>
+
+            <el-select v-model="real_model" @input="change" filterable v-if="!disabled && multiple && collapse" multiple collapse-tags
+                :placeholder="placeholder">
+                <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
+                    <p class="el-select-dropdown__empty">
+                        {{ noMatchingDataText }}
+                    </p>
+                    <ul class="el-scrollbar__view el-select-dropdown__list">
+                        <li class="el-select-dropdown__item el-select__footer">
+                            <div @click="onAddItem">
+                                <i class="fas fa-plus"></i>
+                                <span>
+                                    {{ add_new_text }}
+                                </span>
+                            </div>
+                        </li>
+                    </ul>
                 </div>
-            </el-option>
-        </el-select>
 
-        <el-select v-model="real_model" @input="change" filterable v-if="!disabled && multiple && collapse" multiple collapse-tags
-            :placeholder="placeholder">
-            <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
-                <p class="el-select-dropdown__empty">
-                    {{ noMatchingDataText }}
-                </p>
-                <ul class="el-scrollbar__view el-select-dropdown__list">
-                    <li class="el-select-dropdown__item el-select__footer">
-                        <div @click="onAddItem">
-                            <i class="fas fa-plus"></i>
-                            <span>
-                                {{ add_new_text }}
-                            </span>
-                        </div>
-                    </li>
-                </ul>
-            </div>
+                <div v-else-if="addNew.status && options.length == 0" slot="empty">
+                    <p class="el-select-dropdown__empty">
+                        {{ noDataText }}
+                    </p>
+                    <ul class="el-scrollbar__view el-select-dropdown__list">
+                        <li class="el-select-dropdown__item el-select__footer">
+                            <div @click="onAddItem">
+                                <i class="fas fa-plus"></i>
+                                <span>
+                                    {{ add_new_text }}
+                                </span>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
 
-            <div v-else-if="addNew.status && options.length == 0" slot="empty">
-                <p class="el-select-dropdown__empty">
-                    {{ noDataText }}
-                </p>
-                <ul class="el-scrollbar__view el-select-dropdown__list">
-                    <li class="el-select-dropdown__item el-select__footer">
-                        <div @click="onAddItem">
-                            <i class="fas fa-plus"></i>
-                            <span>
-                                {{ add_new_text }}
-                            </span>
-                        </div>
-                    </li>
-                </ul>
-            </div>
+                <template slot="prefix">
+                    <span class="el-input__suffix-inner el-select-icon">
+                        <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
+                    </span>
+                </template>
 
-            <template slot="prefix">
-                <span class="el-input__suffix-inner el-select-icon">
-                    <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
-                </span>
-            </template>
-
-            <el-option v-if="!group" v-for="(label, value) in selectOptions"
-               :key="value"
-               :label="label"
-               :value="value">
-                <span class="float-left">{{ label }}</span>
-                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-            </el-option>
-
-            <el-option-group
-                v-if="group"
-                v-for="(options, name) in selectOptions"
-                :key="name"
-                :label="name">
-                <el-option
-                    v-for="(label, value) in options"
+                <el-option v-if="!group" v-for="(label, value) in selectOptions"
                     :key="value"
                     :label="label"
                     :value="value">
                     <span class="float-left">{{ label }}</span>
                     <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
                 </el-option>
-            </el-option-group>
 
-            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
-                <div @click="onAddItem">
-                    <i class="fas fa-plus"></i>
-                    <span>
-                        {{ add_new_text }}
-                    </span>
-                </div>
-            </el-option>
-        </el-select>
+                <!-- Todo sortable -->
+                <el-option-group
+                    v-if="group"
+                    v-for="(options, name) in selectOptions"
+                    :key="name"
+                    :label="name">
+                    <el-option
+                        v-for="(label, value) in options"
+                        :key="value"
+                        :label="label"
+                        :value="value">
+                        <span class="float-left">{{ label }}</span>
+                        <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
+                    </el-option>
+                </el-option-group>
 
-        <component v-bind:is="add_new_html" @submit="onSubmit" @cancel="onCancel"></component>
+                <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
+                    <div @click="onAddItem">
+                        <i class="fas fa-plus"></i>
+                        <span>
+                            {{ add_new_text }}
+                        </span>
+                    </div>
+                </el-option>
+            </el-select>
 
-        <span slot="infoBlock" class="badge badge-success badge-resize float-right" v-if="new_options[real_model]">{{ new_text }}</span>
+            <component v-bind:is="add_new_html" @submit="onSubmit" @cancel="onCancel"></component>
 
-        <select :name="name" v-model="real_model" class="d-none">
-            <option v-for="(label, value) in selectOptions" :key="value" :value="value">{{ label }}</option>
-        </select>
+            <span slot="infoBlock" class="badge badge-success badge-resize float-right" v-if="new_options[real_model]">{{ new_text }}</span>
+
+            <select :name="name" v-model="real_model" class="d-none">
+                <option v-for="(label, value) in selectOptions" :key="value" :value="value">{{ label }}</option>
+            </select>
+        </span>
     </base-input>
 </template>
 
@@ -451,6 +835,12 @@ export default {
         },
         options: null,
 
+        option_sortable: {
+            type: String,
+            default: 'value',
+            description: "Option Sortable type (key|value)"
+        },
+
         model: {
             type: [String, Number, Array, Object],
             default: '',
@@ -478,7 +868,7 @@ export default {
             description: "Selectbox Add New Item Feature"
         },
 
-        group:  {
+        group: {
             type: Boolean,
             default: false,
             description: "Selectbox option group status"
@@ -537,6 +927,39 @@ export default {
     },
 
     created() {
+        /*
+        if (this.group != true && Object.keys(this.options).length) {
+            let sortable = [];
+            let option_sortable = this.option_sortable;
+
+            for (var option_key in this.options) {
+                sortable.push({
+                    'key' : option_key,
+                    'value': this.options[option_key]
+                });
+            }
+
+            if (option_sortable == 'value') {
+                sortable.sort(function(a, b) {
+                    var sortableA = a[option_sortable].toUpperCase();
+                    var sortableB = b[option_sortable].toUpperCase();
+
+                    let comparison = 0;
+
+                    if (sortableA > sortableB) {
+                        comparison = 1;
+                    } else if (sortableA < sortableB) {
+                        comparison = -1;
+                    }
+
+                    return comparison;
+                });
+            }
+
+            this.options = sortable;
+        }
+        */
+
         this.new_options = {};
     },
 
@@ -815,4 +1238,4 @@ export default {
         margin-right: 35px;
         position: relative;
     }
-</style>
+</style>
\ No newline at end of file
diff --git a/resources/assets/js/components/AkauntingWidget.vue b/resources/assets/js/components/AkauntingWidget.vue
index 2ef92dabc..456373d86 100644
--- a/resources/assets/js/components/AkauntingWidget.vue
+++ b/resources/assets/js/components/AkauntingWidget.vue
@@ -1,39 +1,39 @@
 <template>
     <akaunting-modal
-            :title="title"
-            :show="display"
-            @cancel="onCancel"
-            v-if="display">
+        :title="title"
+        :show="display"
+        @cancel="onCancel"
+        v-if="display">
         <template #modal-body>
             <div class="modal-body text-left">
                 <div class="row">
                     <div class="col-md-12">
                         <base-input
-                                v-model="form.name"
-                                :label="text.name"
-                                prepend-icon="fas fa-font"
-                                :placeholder="placeholder.name"
-                                inputGroupClasses="input-group-merge">
+                            v-model="form.name"
+                            :label="text.name"
+                            prepend-icon="fas fa-font"
+                            :placeholder="placeholder.name"
+                            inputGroupClasses="input-group-merge">
                         </base-input>
                     </div>
 
                     <div class="col-md-12">
                         <base-input
-                                :label="text.type">
+                            :label="text.type">
                             <span class="el-input__prefix">
                                 <span class="el-input__suffix-inner el-select-icon">
                                     <i class="select-icon-position el-input__icon fa fa-bars"></i>
                                 </span>
                             </span>
                             <el-select
-                                    class="select-primary"
-                                    v-model="form.class" filterable
-                                    :placeholder="placeholder.type">
+                                class="select-primary"
+                                v-model="form.class" filterable
+                                :placeholder="placeholder.type">
                                 <el-option v-for="(name, value) in types"
-                                           class="select-primary"
-                                           :key="name"
-                                           :label="name"
-                                           :value="value">
+                                   class="select-primary"
+                                   :key="name"
+                                   :label="name"
+                                   :value="value">
                                 </el-option>
                             </el-select>
                         </base-input>
@@ -41,21 +41,21 @@
 
                     <div class="col-md-6">
                         <base-input
-                                :label="text.width">
+                            :label="text.width">
                             <span class="el-input__prefix">
                                 <span class="el-input__suffix-inner el-select-icon">
                                     <i class="select-icon-position el-input__icon fas fa-ruler-horizontal"></i>
                                 </span>
                             </span>
                             <el-select
-                                    class="select-primary"
-                                    v-model="form.width" filterable
-                                    :placeholder="placeholder.width">
+                                class="select-primary"
+                                v-model="form.width" filterable
+                                :placeholder="placeholder.width">
                                 <el-option v-for="option in widthOptions"
-                                           class="select-primary"
-                                           :key="option.label"
-                                           :label="option.label"
-                                           :value="option.value">
+                                   class="select-primary"
+                                   :key="option.label"
+                                   :label="option.label"
+                                   :value="option.value">
                                 </el-option>
                             </el-select>
                         </base-input>
@@ -63,11 +63,11 @@
 
                     <div class="col-md-6">
                         <base-input
-                                v-model="form.sort"
-                                :label="text.sort"
-                                prepend-icon="fas fa-sort"
-                                :placeholder="placeholder.sort"
-                                inputGroupClasses="input-group-merge"></base-input>
+                            v-model="form.sort"
+                            :label="text.sort"
+                            prepend-icon="fas fa-sort"
+                            :placeholder="placeholder.sort"
+                            inputGroupClasses="input-group-merge"></base-input>
                     </div>
                 </div>
             </div>
@@ -255,6 +255,10 @@ export default {
         },
 
         onCancel() {
+            let documentClasses = document.body.classList;	
+
+            documentClasses.remove("modal-open");
+
             this.display = false;
             this.form.name = '';
             this.form.enabled = 1;
diff --git a/resources/assets/js/components/CreditCard/CardForm.vue b/resources/assets/js/components/CreditCard/CardForm.vue
index 2a50b3772..0c18de84b 100644
--- a/resources/assets/js/components/CreditCard/CardForm.vue
+++ b/resources/assets/js/components/CreditCard/CardForm.vue
@@ -508,6 +508,8 @@ export default {
             let sum = 0;
             let isOdd = true;
 
+            this.unMaskCardNumber();
+
             /*for (let i = number.length - 1; i >= 0; i--) {
                 let num = number.charAt(i);
 
diff --git a/resources/assets/js/views/purchases/bills.js b/resources/assets/js/views/purchases/bills.js
index 1a1fc8c61..074161131 100644
--- a/resources/assets/js/views/purchases/bills.js
+++ b/resources/assets/js/views/purchases/bills.js
@@ -69,7 +69,9 @@ const app = new Vue({
 
         if (typeof bill_items !== 'undefined' && bill_items) {
             let items = [];
+            let item_backup = this.form.item_backup[0];
             let currency_code = this.form.currency_code;
+
             this.edit.status = true;
 
             bill_items.forEach(function(item) {
@@ -119,18 +121,18 @@ const app = new Vue({
         onCalculateTotal() {
             let sub_total = 0;
             let discount_total = 0;
-            let item_discount_total = 0;
+            let line_item_discount_total = 0;
             let tax_total = 0;
             let grand_total = 0;
             let items = this.form.items;
             let discount_in_totals = this.form.discount;
-            let discount = '';
 
             if (items.length) {
                 let index = 0;
 
                 // get all items.
                 for (index = 0; index < items.length; index++) {
+                    let discount = 0;
                     // get row item and set item variable.
                     let item = items[index];
 
@@ -138,6 +140,15 @@ const app = new Vue({
                     let item_total = item.price * item.quantity;
 
                     // item discount calculate.
+                    let line_discount_amount = 0;
+
+                    if (item.discount) {
+                        line_discount_amount = item_total * (item.discount / 100);
+
+                        item_discounted_total = item_total -= line_discount_amount;
+                        discount = item.discount;
+                    }
+
                     let item_discounted_total = item_total;
 
                     if (discount_in_totals) {
@@ -145,14 +156,6 @@ const app = new Vue({
                         discount = discount_in_totals;
                     }
 
-                    let discount_amount = 0;
-
-                    if (item.discount) {
-                        discount_amount = item_total * (item.discount / 100);
-                        item_discounted_total = item_total - discount_amount;
-                        discount = item.discount;
-                    }
-
                     // item tax calculate.
                     let item_tax_total = 0;
 
@@ -220,7 +223,7 @@ const app = new Vue({
                     }
 
                     // calculate sub, tax, discount all items.
-                    item_discount_total += discount_amount;
+                    line_item_discount_total += line_discount_amount;
                     sub_total += item_total;
                     tax_total += item_tax_total;
                 }
@@ -229,9 +232,7 @@ const app = new Vue({
             // set global total variable.
             this.totals.sub = sub_total;
             this.totals.tax = tax_total;
-            this.totals.item_discount = item_discount_total;
-
-            sub_total -= item_discount_total;
+            this.totals.item_discount = line_item_discount_total;
 
             // Apply discount to total
             if (discount_in_totals) {
diff --git a/resources/assets/js/views/sales/invoices.js b/resources/assets/js/views/sales/invoices.js
index f4c42462c..5d98d9e13 100644
--- a/resources/assets/js/views/sales/invoices.js
+++ b/resources/assets/js/views/sales/invoices.js
@@ -69,7 +69,9 @@ const app = new Vue({
 
         if (typeof invoice_items !== 'undefined' && invoice_items) {
             let items = [];
+            let item_backup = this.form.item_backup[0];
             let currency_code = this.form.currency_code;
+
             this.edit.status = true;
 
             invoice_items.forEach(function(item) {
@@ -119,18 +121,18 @@ const app = new Vue({
         onCalculateTotal() {
             let sub_total = 0;
             let discount_total = 0;
-            let item_discount_total = 0;
+            let line_item_discount_total = 0;
             let tax_total = 0;
             let grand_total = 0;
             let items = this.form.items;
             let discount_in_totals = this.form.discount;
-            let discount = '';
 
             if (items.length) {
                 let index = 0;
 
                 // get all items.
                 for (index = 0; index < items.length; index++) {
+                    let discount = 0;
                     // get row item and set item variable.
                     let item = items[index];
 
@@ -138,6 +140,15 @@ const app = new Vue({
                     let item_total = item.price * item.quantity;
 
                     // item discount calculate.
+                    let line_discount_amount = 0;
+
+                    if (item.discount) {
+                        line_discount_amount = item_total * (item.discount / 100);
+
+                        item_discounted_total = item_total -= line_discount_amount;
+                        discount = item.discount;
+                    }
+
                     let item_discounted_total = item_total;
 
                     if (discount_in_totals) {
@@ -145,14 +156,6 @@ const app = new Vue({
                         discount = discount_in_totals;
                     }
 
-                    let discount_amount = 0;
-
-                    if (item.discount) {
-                        discount_amount = item_total * (item.discount / 100);
-                        item_discounted_total = item_total - discount_amount;
-                        discount = item.discount;
-                    }
-
                     // item tax calculate.
                     let item_tax_total = 0;
 
@@ -220,7 +223,7 @@ const app = new Vue({
                     }
 
                     // calculate sub, tax, discount all items.
-                    item_discount_total += discount_amount;
+                    line_item_discount_total += line_discount_amount;
                     sub_total += item_total;
                     tax_total += item_tax_total;
                 }
@@ -229,9 +232,7 @@ const app = new Vue({
             // set global total variable.
             this.totals.sub = sub_total;
             this.totals.tax = tax_total;
-            this.totals.item_discount = item_discount_total;
-
-            sub_total -= item_discount_total;
+            this.totals.item_discount = line_item_discount_total;
 
             // Apply discount to total
             if (discount_in_totals) {
diff --git a/resources/assets/js/views/wizard/currencies.js b/resources/assets/js/views/wizard/currencies.js
index c487327ad..9287755ef 100644
--- a/resources/assets/js/views/wizard/currencies.js
+++ b/resources/assets/js/views/wizard/currencies.js
@@ -106,5 +106,9 @@ const app = new Vue({
             .catch(error => {
             });
         },
+
+        onSubmit() {	
+            this.form.oldSubmit();	
+        },
     }
 });
diff --git a/resources/assets/js/views/wizard/taxes.js b/resources/assets/js/views/wizard/taxes.js
index fa5ccfb4e..ca0e9cff8 100644
--- a/resources/assets/js/views/wizard/taxes.js
+++ b/resources/assets/js/views/wizard/taxes.js
@@ -78,5 +78,9 @@ const app = new Vue({
 
             this.show = true;
         },
+
+        onSubmit() {	
+            this.form.oldSubmit();	
+        },
     }
 });
diff --git a/resources/assets/sass/core/mixins/_background-variant.scss b/resources/assets/sass/core/mixins/_background-variant.scss
index a0fa4ff98..779c934d1 100644
--- a/resources/assets/sass/core/mixins/_background-variant.scss
+++ b/resources/assets/sass/core/mixins/_background-variant.scss
@@ -1,16 +1,3 @@
-// Contextual backgrounds
-@mixin bg-variant($parent, $color) {
-    #{$parent} {
-        background-color: $color !important;
-    }
-    a#{$parent},
-    button#{$parent} {
-        @include hover-focus {
-            background-color: darken($color, 10%) !important;
-        }
-    }
-}
-
 @mixin bg-gradient-variant($parent, $color) {
     #{$parent} {
         background: linear-gradient(87deg, $color 0, adjust-hue($color, 25%) 100%) !important;
diff --git a/resources/assets/sass/core/navbars/_navbar-vertical.scss b/resources/assets/sass/core/navbars/_navbar-vertical.scss
index 63219761b..20e1c7017 100644
--- a/resources/assets/sass/core/navbars/_navbar-vertical.scss
+++ b/resources/assets/sass/core/navbars/_navbar-vertical.scss
@@ -355,7 +355,9 @@
 // Sidenav states
 
 .g-sidenav-show {
+
     .sidenav {
+
         .navbar-brand,
         .navbar-heading {
             display: block;
diff --git a/resources/lang/bn-BD/install.php b/resources/lang/bn-BD/install.php
index 81255392a..badf090b7 100644
--- a/resources/lang/bn-BD/install.php
+++ b/resources/lang/bn-BD/install.php
@@ -21,7 +21,7 @@ return [
         'disabled'          => ':feature নিষ্ক্রিয় করা আবশ্যক!',
         'extension'         => ':extension  এক্সটেসনটি সংস্থাপন করে লোড করা আবশ্যক!',
         'directory'         => ':directory  ডিরেক্টরিটি লিখনযোগ্য হওয়া আবশ্যক!',
-        'executable'        => 'PHP CLI ফাইলটি চালানো যাচ্ছে না ! দয়া করে আপনার হোস্টিং কোম্পানিকে PHP_BINARY  কিংবা  PHP_PATH environment variable টি সঠিক ভাবে নির্ধারল করে দিতে বলুন।',
+        'executable'        => 'PHP CLI ফাইলটি চালানো যাচ্ছে না কিংবা এটি সংজ্ঞায়িত নয় , অথবা এর ভার্সনটি :php_version  কিংবা তার উর্দ্ধে নয় ! দয়া করে আপনার হোস্টিং কোম্পানিকে PHP_BINARY  কিংবা  PHP_PATH environment variable টি সঠিক ভাবে নির্ধারণ করে দিতে বলুন।',
     ],
 
     'database' => [
diff --git a/resources/lang/de-DE/install.php b/resources/lang/de-DE/install.php
index ac504eebe..77e7078c9 100644
--- a/resources/lang/de-DE/install.php
+++ b/resources/lang/de-DE/install.php
@@ -21,7 +21,7 @@ return [
         'disabled'          => ':feature muss deaktiviert sein!',
         'extension'         => ':extension Erweiterung muss installiert und geladen sein!',
         'directory'         => ':directory Verzeichnis muss schreibbar sein!',
-        'executable'        => 'Die PHP-CLI  Datei funktioniert nicht! Bitten Sie Ihre Hosting-Firma, PHP_BINARY oder PHP_PATH Umgebungsvariable korrekt zu setzen.',
+        'executable'        => 'Die ausführbare PHP-CLI-Datei ist nicht definiert oder funktioniert nicht oder ihre Version ist nicht :php_version oder höher! Bitten Sie Ihre Hosting-Firma, PHP_BINARY oder PHP_PATH Umgebungsvariable korrekt zu setzen.',
     ],
 
     'database' => [
diff --git a/resources/lang/en-GB/install.php b/resources/lang/en-GB/install.php
index 1a6b37dce..c6263be39 100644
--- a/resources/lang/en-GB/install.php
+++ b/resources/lang/en-GB/install.php
@@ -21,7 +21,7 @@ return [
         'disabled'          => ':feature needs to be disabled!',
         'extension'         => ':extension extension needs to be installed and loaded!',
         'directory'         => ':directory directory needs to be writable!',
-        'executable'        => 'The PHP CLI executable file is not working! Please, ask your hosting company to set PHP_BINARY or PHP_PATH environment variable correctly.',
+        'executable'        => 'The PHP CLI executable file is not defined/working or its version is not :php_version or higher! Please, ask your hosting company to set PHP_BINARY or PHP_PATH environment variable correctly.',
     ],
 
     'database' => [
diff --git a/resources/lang/hi-IN/bills.php b/resources/lang/hi-IN/bills.php
index 18ce24336..366abac5d 100644
--- a/resources/lang/hi-IN/bills.php
+++ b/resources/lang/hi-IN/bills.php
@@ -13,6 +13,7 @@ return [
     'price'                 => 'मूल्य',
     'sub_total'             => 'पूर्ण योग',
     'discount'              => 'छूट',
+    'item_discount'         => 'Line Discount',
     'tax_total'             => 'कर राशि',
     'total'                 => 'कुल',
 
@@ -30,6 +31,7 @@ return [
     'add_payment'           => 'भुगतान जोड़ें',
     'mark_paid'             => 'मार्क करे की भुगतान किया हुआ है',
     'mark_received'         => 'प्राप्त किए हुए में मार्क करे',
+    'mark_cancelled'        => 'Mark Cancelled',
     'download_pdf'          => 'डाउनलोड PDF',
     'send_mail'             => 'ईमेल भेजें',
     'create_bill'           => 'बिल बनाएं',
@@ -43,11 +45,13 @@ return [
         'paid'              => 'भुगतान किया',
         'overdue'           => 'समय पर भुगतान नहीं किया',
         'unpaid'            => 'भुगतान नहीं किया है',
+        'cancelled'         => 'Cancelled',
     ],
 
     'messages' => [
-        'received'          => 'बिल को सफलतापूर्वक प्राप्त किया गया!',
+        'marked_received'   => 'Bill marked as received!',
         'marked_paid'       => 'बिल भुगतान के रूप में मार्क किया गया!',
+        'marked_cancelled'  => 'Bill marked as cancelled!',
         'draft'             => 'यह एक <b>ड्राफ्ट</b> बिल है और इसे प्राप्त होने के बाद चार्ट पर प्रतिबिंबित किया जाएगा।',
 
         'status' => [
diff --git a/resources/lang/hi-IN/bulk_actions.php b/resources/lang/hi-IN/bulk_actions.php
index 972a4cf47..4b86107f5 100644
--- a/resources/lang/hi-IN/bulk_actions.php
+++ b/resources/lang/hi-IN/bulk_actions.php
@@ -15,6 +15,7 @@ return [
         'paid'          => 'क्या आप वाकई चयनित चालान को <b>भुगतान</b> के रूप में चिह्नित करना चाहते हैं?|क्या आप सुनिश्चित हैं कि आप चयनित चालान को <b>भुगतान</b> के रूप में चिह्नित करना चाहते हैं?',
         'sent'          => 'क्या आप सुनिश्चित हैं कि आप चयनित चालान को <b>भेजे गए</b> के रूप में चिह्नित करना चाहते हैं?|क्या आप सुनिश्चित हैं कि आप चयनित चालान को <b>भेजे गए</b> के रूप में चिह्नित करना चाहते हैं?',
         'received'      => 'क्या आप वाकई चयनित बिल को <b>प्राप्त किये</b> गए के रूप में चिह्नित करना चाहते हैं?|क्या आप वाकई चयनित बिलों को <b>प्राप्त किये</b> गए के रूप में चिह्नित करना चाहते हैं?',
+        'cancelled'     => 'Are you sure you want to <b>cancel</b> selected invoice/bill?|Are you sure you want to <b>cancel</b> selected invoices/bills?',
     ],
 
 ];
diff --git a/resources/lang/hi-IN/install.php b/resources/lang/hi-IN/install.php
index 1e4697de2..2071ff424 100644
--- a/resources/lang/hi-IN/install.php
+++ b/resources/lang/hi-IN/install.php
@@ -21,6 +21,7 @@ return [
         'disabled'          => ':feature को निष्क्रिय करने की आवश्यकता है!',
         'extension'         => ':extension एक्सटेंशन को स्थापित करने और लोड करने की आवश्यकता है!',
         'directory'         => ':directory फ़ोल्डर को लिखने योग्य होना चाहिए!',
+        'executable'        => 'अगर  PHP CLI एक्सेक्यूटबल फाइल परिभाषित नहीं है अथवा काम नहीं कर रही है अथवा उसका संस्करण php_version के समान या उससे अधिक नहीं है! तो कृपया, अपनी होस्टिंग कंपनी को PHP_BINARY या PHP_PATH ये एनवायरनमेंट वेरिएबल सही ढंग से सेट करने के लिए कहें।',
     ],
 
     'database' => [
diff --git a/resources/lang/hi-IN/invoices.php b/resources/lang/hi-IN/invoices.php
index 82117afc9..154c71561 100644
--- a/resources/lang/hi-IN/invoices.php
+++ b/resources/lang/hi-IN/invoices.php
@@ -13,6 +13,7 @@ return [
     'price'                 => 'कीमत',
     'sub_total'             => 'पूर्ण योग',
     'discount'              => 'छूट',
+    'item_discount'         => 'Line Discount',
     'tax_total'             => 'कुल कर',
     'total'                 => 'कुल',
 
@@ -30,6 +31,7 @@ return [
     'mark_paid'             => 'मार्क करे की भुगतान किया हुआ है',
     'mark_sent'             => 'मार्क करे की भेजा गया',
     'mark_viewed'           => 'मार्क किया हुआ देखे',
+    'mark_cancelled'        => 'Mark Cancelled',
     'download_pdf'          => 'डाउनलोड PDF',
     'send_mail'             => 'ईमेल भेजें',
     'all_invoices'          => 'सभी चालान देखने के लिए लॉगिन करें',
@@ -47,12 +49,15 @@ return [
         'paid'              => 'भुगतान किया है',
         'overdue'           => 'समय पर भुगतान नहीं किया',
         'unpaid'            => 'भुगतान नहीं किया है',
+        'cancelled'         => 'Cancelled',
     ],
 
     'messages' => [
         'email_sent'        => 'चालान ईमेल भेजा गया है!',
         'marked_sent'       => 'भेजे गए के रूप में मार्क किया गया!',
         'marked_paid'       => 'चालान भुगतान के रूप में मार्क किया गया!',
+        'marked_viewed'     => 'Invoice marked as viewed!',
+        'marked_cancelled'  => 'Invoice marked as cancelled!',
         'email_required'    => 'इस ग्राहक के लिए कोई ईमेल पता नहीं!',
         'draft'             => 'यह एक <b>ड्राफ्ट</b> चालान है और इसे भेजे जाने के बाद चार्ट में प्रतिबिंबित होगा।',
 
diff --git a/resources/lang/hi-IN/settings.php b/resources/lang/hi-IN/settings.php
index ff7ea8d58..0dba551f3 100644
--- a/resources/lang/hi-IN/settings.php
+++ b/resources/lang/hi-IN/settings.php
@@ -29,6 +29,12 @@ return [
             'before'        => 'नंबर से पहले',
             'after'         => 'नंबर के बाद',
         ],
+        'discount_location' => [
+            'name'          => 'Discount Location',
+            'item'          => 'At line',
+            'total'         => 'At total',
+            'both'          => 'Both line and total',
+        ],
     ],
 
     'invoice' => [
diff --git a/resources/lang/hr-HR/bills.php b/resources/lang/hr-HR/bills.php
index ea27f4d9b..e5e10fd64 100644
--- a/resources/lang/hr-HR/bills.php
+++ b/resources/lang/hr-HR/bills.php
@@ -13,6 +13,7 @@ return [
     'price'                 => 'Cijena',
     'sub_total'             => 'Podzbroj',
     'discount'              => 'Popust',
+    'item_discount'         => 'Line Discount',
     'tax_total'             => 'Porez Ukupno',
     'total'                 => 'Ukupno',
 
@@ -28,7 +29,9 @@ return [
     'histories'             => 'Povijesti',
     'payments'              => 'Plaćanja',
     'add_payment'           => 'Dodaj plaćanje',
+    'mark_paid'             => 'Mark Paid',
     'mark_received'         => 'Označi kao primljeno',
+    'mark_cancelled'        => 'Mark Cancelled',
     'download_pdf'          => 'Preuzmite PDF',
     'send_mail'             => 'Pošalji e-mail',
     'create_bill'           => 'Kreiraj fakturu',
@@ -42,10 +45,13 @@ return [
         'paid'              => 'Plaćeno',
         'overdue'           => 'Dospjelo',
         'unpaid'            => 'Neplaćeno',
+        'cancelled'         => 'Cancelled',
     ],
 
     'messages' => [
-        'received'          => 'Račun označen kao uspješno primljen!',
+        'marked_received'   => 'Bill marked as received!',
+        'marked_paid'       => 'Bill marked as paid!',
+        'marked_cancelled'  => 'Bill marked as cancelled!',
         'draft'             => 'Ovo je <b>SKICA</b> računa i odrazit će se na grafikone nakon što se zaprimi.',
 
         'status' => [
diff --git a/resources/lang/hr-HR/bulk_actions.php b/resources/lang/hr-HR/bulk_actions.php
index ef50a6728..47e7e7838 100644
--- a/resources/lang/hr-HR/bulk_actions.php
+++ b/resources/lang/hr-HR/bulk_actions.php
@@ -2,8 +2,9 @@
 
 return [
 
-    'bulk_actions'     => 'Skupna akcija | Skupne akcije',
-    'selected'         => 'odabrano',
+    'bulk_actions'      => 'Skupna akcija | Skupne akcije',
+    'selected'          => 'odabrano',
+    'no_action'         => 'No action available',
 
     'message' => [
         'duplicate'     => 'Jeste li sigurni da želite <b> duplicirati </b> odabrani zapis?',
@@ -14,6 +15,7 @@ return [
         'paid'          => 'Jeste li sigurni da odabranu fakturu želite označiti kao <b> plaćenu </b>? | Jeste li sigurni da odabrane račune želite označiti kao <b> plaćene </b>?',
         'sent'          => 'Jeste li sigurni da odabranu fakturu želite označiti kao <b> poslanu </b>? | Jeste li sigurni da odabrane račune želite označiti kao <b> poslane </b>?',
         'received'      => 'Jeste li sigurni da odabrani račun želite označiti kao <b> primljeni </b>? | Jeste li sigurni da odabrane račune želite označiti kao <b> primljene </b>?',
+        'cancelled'     => 'Are you sure you want to <b>cancel</b> selected invoice/bill?|Are you sure you want to <b>cancel</b> selected invoices/bills?',
     ],
 
 ];
diff --git a/resources/lang/hr-HR/general.php b/resources/lang/hr-HR/general.php
index a7bffb727..48b600614 100644
--- a/resources/lang/hr-HR/general.php
+++ b/resources/lang/hr-HR/general.php
@@ -47,10 +47,10 @@ return [
     'charts'                => 'Grafikon | Grafikoni',
     'localisations'         => 'Lokalizacija | lokalizacije',
     'defaults'              => 'Zadano | Zadana',
-    'widgets'               => 'Widget | Widgeti',
-    'templates'             => 'Predložak| Predlošci',
-    'sales'                 => 'Prodaja | Prodaje',
-    'purchases'             => 'Kupnja | Kupnje',
+    'widgets'               => 'Widget|Widgeti',
+    'templates'             => 'Predložak|Predlošci',
+    'sales'                 => 'Prodaja|Prodaje',
+    'purchases'             => 'Kupnja|Kupnje',
 
     'welcome'               => 'Dobrodošli',
     'banking'               => 'Bankarstvo',
@@ -133,7 +133,7 @@ return [
     'frequency'             => 'Frekvencija',
     'start'                 => 'Početak',
     'end'                   => 'Kraj',
-    'clear'                 => 'Očisti',
+    'clear'                 => 'Poništi',
     'difference'            => 'Razlika',
     'footer'                => 'Podnožje',
     'start_date'            => 'Datum početka',
@@ -163,10 +163,10 @@ return [
     'title' => [
         'new'               => 'Novo - :type',
         'edit'              => 'Uređivanje - :type',
-        'delete'            => 'Izbriši: tip',
+        'delete'            => 'Izbriši :tip',
         'create'            => 'Kreiraj :type',
         'send'              => 'Pošalji :tip',
-        'get'               => 'Dobijte: type',
+        'get'               => 'Dohvati :type',
         'add'               => 'Dodaj :type',
         'manage'            => 'Promijeni :type',
     ],
diff --git a/resources/lang/hr-HR/install.php b/resources/lang/hr-HR/install.php
index fb82b8f6e..b53aef0fc 100644
--- a/resources/lang/hr-HR/install.php
+++ b/resources/lang/hr-HR/install.php
@@ -21,6 +21,7 @@ return [
         'disabled'          => ':feature mora biti onemogućeno!',
         'extension'         => ':extension proširenje mora biti instalirano i učitano!',
         'directory'         => ':directory direktorij mora biti omogućen za zapisivanje!',
+        'executable'        => 'The PHP CLI executable file is not defined/working or its version is not :php_version or higher! Please, ask your hosting company to set PHP_BINARY or PHP_PATH environment variable correctly.',
     ],
 
     'database' => [
diff --git a/resources/lang/hr-HR/invoices.php b/resources/lang/hr-HR/invoices.php
index 93d8c774a..26e482d90 100644
--- a/resources/lang/hr-HR/invoices.php
+++ b/resources/lang/hr-HR/invoices.php
@@ -13,6 +13,7 @@ return [
     'price'                 => 'Cijena',
     'sub_total'             => 'Podzbroj',
     'discount'              => 'Popust',
+    'item_discount'         => 'Line Discount',
     'tax_total'             => 'Porez Ukupno',
     'total'                 => 'Ukupno',
 
@@ -30,6 +31,7 @@ return [
     'mark_paid'             => 'Označi kao plaćeno',
     'mark_sent'             => 'Označi kao poslano',
     'mark_viewed'           => 'Označi pogledano',
+    'mark_cancelled'        => 'Mark Cancelled',
     'download_pdf'          => 'Preuzmite PDF',
     'send_mail'             => 'Pošalji e-mail',
     'all_invoices'          => 'Prijavite se za pregled svih faktura',
@@ -47,12 +49,15 @@ return [
         'paid'              => 'Plaćeno',
         'overdue'           => 'Kasne',
         'unpaid'            => 'Neplaćeno',
+        'cancelled'         => 'Cancelled',
     ],
 
     'messages' => [
         'email_sent'        => 'E-adresa s računom je poslana!',
         'marked_sent'       => 'Račun označen kao poslan!',
         'marked_paid'       => 'Račun označen kao plaćen!',
+        'marked_viewed'     => 'Invoice marked as viewed!',
+        'marked_cancelled'  => 'Invoice marked as cancelled!',
         'email_required'    => 'Nema e-mail adrese za ovog kupca!',
         'draft'             => 'This is a <b>SKICA</b> invoice and will be reflected to charts after it gets sent.',
 
diff --git a/resources/lang/hr-HR/messages.php b/resources/lang/hr-HR/messages.php
index a3b580037..23ca7b2bc 100644
--- a/resources/lang/hr-HR/messages.php
+++ b/resources/lang/hr-HR/messages.php
@@ -28,6 +28,8 @@ return [
     'warning' => [
         'deleted'           => 'Upozorenje: Nije vam dozvoljeno izbrisati <b>:name</b> jer postoji poveznica s :text.',
         'disabled'          => 'Upozorenje: Nije vam dozvoljeno onemogućiti <b>:name</b> jer postoji poveznica s :text.',
+        'reconciled_tran'   => 'Warning: You are not allowed to change/delete transaction because it is reconciled!',
+        'reconciled_doc'    => 'Warning: You are not allowed to change/delete :type because it has reconciled transactions!',
         'disable_code'      => 'Upozorenje: Nije vam dopušteno onesposobiti ili promijeniti valutu <b>: ime </b> jer je: tekst povezan.',
         'payment_cancel'    => 'Upozorenje: Otkazali ste nedavni: način plaćanja!',
     ],
diff --git a/resources/lang/hr-HR/passwords.php b/resources/lang/hr-HR/passwords.php
index a232ce26f..427e85241 100644
--- a/resources/lang/hr-HR/passwords.php
+++ b/resources/lang/hr-HR/passwords.php
@@ -18,5 +18,6 @@ return [
     'sent' => 'Link za resetiranje lozinke je poslan na e-mail!',
     'token' => 'Token za resetiranje lozinke nije važeći.',
     'user' => "Ne možemo pronaći korisnika s tom e-mail adresom.",
+    'throttle' => 'Please wait before retrying.',
 
 ];
diff --git a/resources/lang/hr-HR/reports.php b/resources/lang/hr-HR/reports.php
index 803d8d2db..73097cade 100644
--- a/resources/lang/hr-HR/reports.php
+++ b/resources/lang/hr-HR/reports.php
@@ -12,7 +12,7 @@ return [
     'net_profit'            => 'Neto dobit',
     'total_expenses'        => 'Ukupni troškovi',
     'net'                   => 'Neto',
-    'income_expense'        => 'Prihodi i rashodi',
+    'income_expense'        => 'Prihod i rashod',
 
     'summary' => [
         'income'            => 'Sažetak prihoda',
diff --git a/resources/lang/hr-HR/settings.php b/resources/lang/hr-HR/settings.php
index 10e74be26..ea597b648 100644
--- a/resources/lang/hr-HR/settings.php
+++ b/resources/lang/hr-HR/settings.php
@@ -29,6 +29,12 @@ return [
             'before'        => 'Ispred broja',
             'after'         => 'Nakon broja',
         ],
+        'discount_location' => [
+            'name'          => 'Discount Location',
+            'item'          => 'At line',
+            'total'         => 'At total',
+            'both'          => 'Both line and total',
+        ],
     ],
 
     'invoice' => [
diff --git a/resources/lang/hr-HR/validation.php b/resources/lang/hr-HR/validation.php
index eb6bb3fa3..7b338d4fa 100644
--- a/resources/lang/hr-HR/validation.php
+++ b/resources/lang/hr-HR/validation.php
@@ -100,10 +100,11 @@ return [
 
     'custom' => [
         'attribute-name' => [
-            'rule-name' => 'prilagođena-poruka',
+            'rule-name'             => 'prilagođena-poruka',
         ],
-        'invalid_currency' => ': Atributni kod nije valjan.',
-        'invalid_amount'   => 'Iznos: atribut nije važeći.',
+        'invalid_currency'      => ': Atributni kod nije valjan.',
+        'invalid_amount'        => 'Iznos: atribut nije važeći.',
+        'invalid_extension'     => 'The file extension is invalid.',
     ],
 
     /*
diff --git a/resources/lang/hr-HR/widgets.php b/resources/lang/hr-HR/widgets.php
index 2fc18a366..66beee487 100644
--- a/resources/lang/hr-HR/widgets.php
+++ b/resources/lang/hr-HR/widgets.php
@@ -4,7 +4,7 @@ return [
 
     'total_income'              => 'Ukupni prihodi',
     'receivables'               => 'Potraživanja',
-    'open_invoices'             => 'Otvorite fakture',
+    'open_invoices'             => 'Otvorene fakture',
     'overdue_invoices'          => 'Dospjele fakture',
     'total_expenses'            => 'Ukupni troškovi',
     'payables'                  => 'Dugovanja',
diff --git a/resources/lang/id-ID/auth.php b/resources/lang/id-ID/auth.php
index 54151ac6d..e3a05b142 100644
--- a/resources/lang/id-ID/auth.php
+++ b/resources/lang/id-ID/auth.php
@@ -13,6 +13,7 @@ return [
     'current_email'         => 'Email saat ini',
     'reset'                 => 'Atur Ulang',
     'never'                 => 'jangan pernah',
+    'landing_page'          => 'Halaman Muka',
 
     'password' => [
         'current'           => 'Kata Sandi',
diff --git a/resources/lang/id-ID/bills.php b/resources/lang/id-ID/bills.php
index a96efa23c..b3e75d5ef 100644
--- a/resources/lang/id-ID/bills.php
+++ b/resources/lang/id-ID/bills.php
@@ -13,6 +13,7 @@ return [
     'price'                 => 'Harga',
     'sub_total'             => 'Subtotal',
     'discount'              => 'Diskon',
+    'item_discount'         => 'Potongan Harga',
     'tax_total'             => 'Total Pajak',
     'total'                 => 'Total',
 
@@ -28,7 +29,9 @@ return [
     'histories'             => 'Riwayat',
     'payments'              => 'Pembayaran',
     'add_payment'           => 'Tambahkan Pembayaran',
+    'mark_paid'             => 'Tandai sudah dibayar',
     'mark_received'         => 'Tandai Diterima',
+    'mark_cancelled'        => 'Dibatalkan',
     'download_pdf'          => 'Unduh PDF',
     'send_mail'             => 'Kirim Email',
     'create_bill'           => 'Membuat Tagihan',
@@ -40,10 +43,15 @@ return [
         'received'          => 'Diterima',
         'partial'           => 'Sebagian',
         'paid'              => 'Dibayar',
+        'overdue'           => 'Jatuh Tempo',
+        'unpaid'            => 'Belum Dibayar',
+        'cancelled'         => 'Dibatalkan',
     ],
 
     'messages' => [
-        'received'          => 'Tagihan ditandai berhasil diterima!',
+        'marked_received'   => 'Tagihan sudah diterima',
+        'marked_paid'       => 'Tagihan sudah dibayar',
+        'marked_cancelled'  => 'Tagihan dibatalkan',
         'draft'             => 'Ini adalah <b>DRAFT</b> tagihan dan akan terlihat di grafik setelah dibayarkan.',
 
         'status' => [
diff --git a/resources/lang/id-ID/bulk_actions.php b/resources/lang/id-ID/bulk_actions.php
index fee2d46a0..1e721694b 100644
--- a/resources/lang/id-ID/bulk_actions.php
+++ b/resources/lang/id-ID/bulk_actions.php
@@ -2,18 +2,20 @@
 
 return [
 
-    'bulk_actions'     => 'Tindakan Penting|Tindakan Penting',
-    'selected'         => 'dipilih',
+    'bulk_actions'      => 'Tindakan Penting|Tindakan Penting',
+    'selected'          => 'dipilih',
+    'no_action'         => 'Tidak ada  yang tersedia',
 
     'message' => [
-        'duplicate'     => 'Are you sure you want to <b>duplicate</b> selected record?',
-        'delete'        => 'Are you sure you want to <b>delete</b> selected record?|Are you sure you want to <b>delete</b> selected records?',
-        'export'        => 'Are you sure you want to <b>export</b> selected record?|Are you sure you want to <b>export</b> selected records?',
-        'enable'        => 'Are you sure you want to <b>enable</b> selected record?|Are you sure you want to <b>enable</b> selected records?',
-        'disable'       => 'Are you sure you want to <b>disable</b> selected record?|Are you sure you want to <b>disable</b> selected records?',
-        'paid'          => 'Are you sure you want to mark selected invoice as <b>paid</b>?|Are you sure you want to mark selected invoices as <b>paid</b>?',
-        'sent'          => 'Are you sure you want to mark selected invoice as <b>sent</b>?|Are you sure you want to mark selected invoices as <b>sent</b>?',
-        'received'      => 'Are you sure you want to mark selected bill as <b>received</b>?|Are you sure you want to mark selected bills as <b>received</b>?',
+        'duplicate'     => 'Yakin ingin <b> menggandakan </b> catatan yang dipilih?',
+        'delete'        => 'Yakin ingin <b> menghapus </b> data yang dipilih? | Yakin ingin <b> menghapus </b> data yang dipilih?',
+        'export'        => 'Yakin ingin <b> mengekspor </b> catatan yang dipilih? | Yakin ingin <b> mengekspor </b> catatan yang dipilih?',
+        'enable'        => 'Yakin ingin <b> mengaktifkan </b> catatan yang dipilih? | Yakin ingin <b> mengaktifkan </b> catatan yang dipilih?',
+        'disable'       => 'Yakin ingin <b> mengaktifkan </b> catatan yang dipilih? | Yakin ingin <b> mengaktifkan </b> catatan yang dipilih?',
+        'paid'          => 'Yakin ingin menandai faktur yang dipilih sebagai <b> berbayar </b>? Apakah Anda yakin ingin menandai faktur yang dipilih sebagai <b> berbayar </b>?',
+        'sent'          => 'Yakin ingin menandai faktur yang dipilih sebagai <b> berbayar </b>? Apakah Anda yakin ingin menandai faktur yang dipilih sebagai <b> berbayar </b>?',
+        'received'      => 'Yakin ingin menandai tagihan terpilih sebagai <b> diterima </b>? Apakah Anda yakin ingin menandai tagihan terpilih sebagai <b> diterima </b>?',
+        'cancelled'     => 'Yakin ingin <b>membatalkan</b> Faktur/ Tagihan yg dipilih?| Yakin ingin <b>membatalkan</b> Faktur/ Tagihan yg dipilih?',
     ],
 
 ];
diff --git a/resources/lang/id-ID/companies.php b/resources/lang/id-ID/companies.php
index 488d112fd..9ba585de4 100644
--- a/resources/lang/id-ID/companies.php
+++ b/resources/lang/id-ID/companies.php
@@ -4,12 +4,11 @@ return [
 
     'domain'                => 'Domain',
     'logo'                  => 'Logo',
-    'manage'                => 'Mengelola Perusahaan',
-    'all'                   => 'Semua Perusahaan',
 
     'error' => [
         'not_user_company'  => 'Error: Anda tidak diperbolehkan merubah perusahaan ini!',
-        'delete_active'     => 'Error: Tidak dapat menghapus perusahaan aktif, silahkan, ubah status perusahaan terlebih dahulu!',
+        'delete_active'     => 'Kesalahan: kamu tidak dapat menghapus Perusahaan aktif, silahkan berpindah perusahaan terlebih dahulu!',
+        'disable_active'    => 'Kesalahan: Tidak dapat menonaktifkan perusahaan yang aktif. Silakan, beralih ke yang lain dulu!',
     ],
 
 ];
diff --git a/resources/lang/id-ID/customers.php b/resources/lang/id-ID/customers.php
index 9a5cc0330..a788b40d9 100644
--- a/resources/lang/id-ID/customers.php
+++ b/resources/lang/id-ID/customers.php
@@ -6,7 +6,7 @@ return [
     'user_created'          => 'Pengguna Dibuat',
 
     'error' => [
-        'email'             => 'Email ini sudah dipakai.'
+        'email'             => 'Email ini sudah dipakai.',
     ],
 
 ];
diff --git a/resources/lang/id-ID/demo.php b/resources/lang/id-ID/demo.php
index 0a1c12341..d41df6758 100644
--- a/resources/lang/id-ID/demo.php
+++ b/resources/lang/id-ID/demo.php
@@ -2,12 +2,33 @@
 
 return [
 
-    'accounts_cash'         => 'Kas',
-    'categories_deposit'    => 'Deposit',
-    'categories_sales'      => 'Penjualan',
-    'currencies_usd'        => 'Dolar Amerika Serikat',
-    'currencies_eur'        => 'Euro',
-    'currencies_gbp'        => 'Pound sterling Inggris',
-    'currencies_try'        => 'Lira Turki',
+    'accounts' => [
+        'cash'              => 'Tunai',
+    ],
+
+    'categories' => [
+        'deposit'           => 'Deposit',
+        'sales'             => 'Penjualan',
+    ],
+
+    'currencies' => [
+        'usd'               => 'Dolar Amerika Serikat',
+        'eur'               => 'Euro',
+        'gbp'               => 'Pound sterling Inggris',
+        'try'               => 'Lira Turki',
+    ],
+
+    'offline_payments' => [
+        'cash'              => 'Tunai',
+        'bank'              => 'Transfer Bank',
+    ],
+
+    'reports' => [
+        'income'            => 'Ringkasan penghasilan bulanan berdasarkan kategori.',
+        'expense'           => 'Ringkasan pengeluaran bulanan berdasarkan kategori.',
+        'income_expense'    => 'Penghasilan bulanan vs biaya berdasarkan kategori.',
+        'tax'               => 'Ringkasan pajak triwulanan.',
+        'profit_loss'       => 'Laba & rugi triwulan menurut kategori.',
+    ],
 
 ];
diff --git a/resources/lang/id-ID/email_templates.php b/resources/lang/id-ID/email_templates.php
index 62b72048d..ff7d609e4 100644
--- a/resources/lang/id-ID/email_templates.php
+++ b/resources/lang/id-ID/email_templates.php
@@ -19,32 +19,32 @@ return [
 
     'invoice_recur_customer' => [
         'subject'       => 'tagihan ulang nomor {invoice_number} dibuat',
-        'body'          => 'Dear {customer_name},<br /><br />Based on your recurring circle, we have prepared the following invoice for you: <strong>{invoice_number}</strong>.<br /><br />You can see the invoice details and proceed with the payment from the following link: <a href="{invoice_guest_link}">{invoice_number}</a>.<br /><br />Feel free to contact us for any question.<br /><br />Best Regards,<br />{company_name}',
+        'body'          => 'Kepada {customer_name},<br /><br />Kami telah mempersiapkan tagihan kepada Anda sebagai berikut: <strong>{invoice_number}</strong>.<br /><br />Anda dapat melihat rincian tagihan dan dilanjutkan dengan pembayaran dari link berikut ini: <a href="{invoice_guest_link}">{invoice_number}</a>.<br /><br />Apabila ada pertanyaan harap hubungi kami.<br /><br />Hormat Kami,,<br />{company_name}',
     ],
 
     'invoice_recur_admin' => [
-        'subject'       => '{invoice_number} recurring invoice created',
-        'body'          => 'Hello,<br /><br /> Based on {customer_name} recurring circle, <strong>{invoice_number}</strong> invoice has been automatically created.<br /><br />You can see the invoice details from the following link: <a href="{invoice_admin_link}">{invoice_number}</a>.<br /><br />Best Regards,<br />{company_name}',
+        'subject'       => 'tagihan ulang nomor {invoice_number} dibuat',
+        'body'          => 'Halo, <br /> <br /> Berdasarkan lingkaran berulang {customer_name}, <strong> {invoice_number} </strong> faktur telah dibuat secara otomatis. <br /> <br /> Anda dapat melihat detail faktur dari tautan berikut: <a href="{invoice_admin_link}"> {invoice_number} </a>. <br /> <br /> Salam, <br /> {company_name}',
     ],
 
     'invoice_payment_customer' => [
-        'subject'       => 'Payment received for {invoice_number} invoice',
-        'body'          => 'Dear {customer_name},<br /><br />Thank you for the payment. Find the payment details below:<br /><br />-------------------------------------------------<br /><br />Amount: <strong>{transaction_total}<br /></strong>Date: <strong>{transaction_paid_date}</strong><br />Invoice Number: <strong>{invoice_number}<br /><br /></strong>-------------------------------------------------<br /><br />You can always see the invoice details from the following link: <a href="{invoice_guest_link}">{invoice_number}</a>.<br /><br />Feel free to contact us for any question.<br /><br />Best Regards,<br />{company_name}',
+        'subject'       => 'Pembayaran diterima untuk faktur {invoice_number}',
+        'body'          => 'Dear {customer_name}, <br /> <br /> Terima kasih atas pembayarannya. Temukan detail pembayaran di bawah ini: <br /> <br /> ------------------------------------ ------------- <br /> Jumlah: <strong> {transaction_total} </strong> <br /> Tanggal: <strong> {transaction_paid_date} </strong> <br /> Faktur Nomor: <strong> {invoice_number} </strong> <br /> ---------------------------------- --------------- <br /> <br /> Anda selalu dapat melihat detail faktur dari tautan berikut: <a href="{invoice_guest_link}"> {invoice_number} </ a>. <br /> <br /> Jangan ragu untuk menghubungi kami jika ada pertanyaan. <br /> <br /> Salam, <br /> {company_name}',
     ],
 
     'invoice_payment_admin' => [
-        'subject'       => 'Payment received for {invoice_number} invoice',
-        'body'          => 'Hello,<br /><br />{customer_name} recorded a payment for <strong>{invoice_number}</strong> invoice.<br /><br />You can see the invoice details from the following link: <a href="{invoice_admin_link}">{invoice_number}</a>.<br /><br />Best Regards,<br />{company_name}',
+        'subject'       => 'Pembayaran diterima untuk faktur {invoice_number}',
+        'body'          => 'Halo, <br /> <br /> Berdasarkan lingkaran berulang {customer_name}, <strong> {invoice_number} </strong> faktur telah dibuat secara otomatis. <br /> <br /> Anda dapat melihat detail faktur dari tautan berikut: <a href="{invoice_admin_link}"> {invoice_number} </a>. <br /> <br /> Salam, <br /> {company_name}',
     ],
 
     'bill_remind_admin' => [
-        'subject'       => '{bill_number} bill reminding notice',
-        'body'          => 'Hello,<br /><br />This is a reminding notice for <strong>{bill_number}</strong> bill to {vendor_name}.<br /><br />The bill total is {bill_total} and is due <strong>{bill_due_date}</strong>.<br /><br />You can see the bill details from the following link: <a href="{bill_admin_link}">{bill_number}</a>.<br /><br />Best Regards,<br />{company_name}',
+        'subject'       => '{bill_number} pemberitahuan pengingat tagihan',
+        'body'          => 'Halo, <br /> <br /> Ini adalah pemberitahuan untuk tagihan <strong> {bill_number} </strong> ke {vendor_name}. <br /> <br /> Total tagihan adalah {bill_total} dan sudah jatuh tempo <strong> {bill_due_date} </strong>. <br /> <br /> Anda dapat melihat detail tagihan dari tautan berikut: <a href="{bill_admin_link}"> {bill_number} </a>. <br /> <br /> Salam, <br /> {company_name}',
     ],
 
     'bill_recur_admin' => [
-        'subject'       => '{bill_number} recurring bill created',
-        'body'          => 'Hello,<br /><br /> Based on {vendor_name} recurring circle, <strong>{bill_number}</strong> invoice has been automatically created.<br /><br />You can see the bill details from the following link: <a href="{bill_admin_link}">{bill_number}</a>.<br /><br />Best Regards,<br />{company_name}',
+        'subject'       => '{bill_number} tagihan berulang dibuat',
+        'body'          => 'Halo, <br /> <br /> Berdasarkan lingkaran berulang {customer_name}, <strong> {invoice_number} </strong> faktur telah dibuat secara otomatis. <br /> <br /> Anda dapat melihat detail faktur dari tautan berikut: <a href="{invoice_admin_link}"> {invoice_number} </a>. <br /> <br /> Salam, <br /> {company_name}',
     ],
 
 ];
diff --git a/resources/lang/id-ID/errors.php b/resources/lang/id-ID/errors.php
index 1b0b48112..e6fd24d3d 100644
--- a/resources/lang/id-ID/errors.php
+++ b/resources/lang/id-ID/errors.php
@@ -2,20 +2,22 @@
 
 return [
 
-    'forbidden_access' => 'Akses tidak diizinkan',
-    'error_page'       => 'Halaman error.',
-    'page_not_found'   => 'Halaman tidak ditemukan',
-
-    'body'   => [
-        'forbidden_access' => 'Mohon maaf! Akses halaman ditolak.',
-        'error_page' => 'Mohon maaf! Terdapat sesuatu yang salah.',
-        'page_not_found' => 'Mohon maaf! Halaman tidak ditemukan.',
+    'title' => [
+        '403' => 'Mohon maaf! Akses halaman ditolak',
+        '404' => 'Mohon maaf! Halaman tidak ditemukan',
+        '500' => 'Ups. Terjadi kesalahan',
     ],
 
-    'messages'   => [
-        'forbidden_access' => 'Anda tidak dapat mengakses halaman ini.        Tetapi, mungkin Anda dapat <a href=":link">kembali ke Beranda.</a>.',
-        'error_page' => 'Kami akan memperbaikinya.        Tetapi, mungkin Anda dapat <a href=":link">kembali ke Beranda</a>.',
-        'page_not_found' => 'Kami tidak dapat menemukan halaman yang Anda maksud.        Tetapi, mungkin Anda dapat <a href=":link">kembali ke Beranda</a>.',
+    'header' => [
+        '403' => '403 Dilarang',
+        '404' => '404 Tidak ditemukan',
+        '500' => 'Kesalahan server internal 500',
+    ],
+
+    'message' => [
+        '403' => 'Anda tidak dapat mengakses halaman ini.',
+        '404' => 'Kami tidak dapat menemukan halaman yang Anda cari.',
+        '500' => 'Kami akan segera memperbaikinya.',
     ],
 
 ];
diff --git a/resources/lang/id-ID/general.php b/resources/lang/id-ID/general.php
index 72eab3dda..953f01aae 100644
--- a/resources/lang/id-ID/general.php
+++ b/resources/lang/id-ID/general.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'dashboards'            => 'Dashboard|Dashboards',
+    'dashboards'            => 'Dasbor|Dasbor',
     'items'                 => 'Item|Item',
     'incomes'               => 'Pendapatan| Pendapatan',
     'invoices'              => 'Faktur | faktur',
@@ -42,15 +42,17 @@ return [
     'contacts'              => 'Kontak',
     'reconciliations'       => 'Rekonsiliasi|Rekonsiliasi',
     'developers'            => 'Pengembang|Pengembang',
-    'schedules'             => 'Schedule|Schedules',
-    'groups'                => 'Group|Groups',
-    'charts'                => 'Chart|Charts',
-    'localisations'         => 'Localisation|Localisations',
+    'schedules'             => 'Jadwal|Jadwal',
+    'groups'                => 'Grup|Grup',
+    'charts'                => 'Bagan|Bagan',
+    'localisations'         => 'Lokalisasi|Lokalisasi',
     'defaults'              => 'Default|Defaults',
-    'widgets'               => 'Widget|Widgets',
+    'widgets'               => 'Widget|Widget',
+    'templates'             => 'Templat|Templat',
+    'sales'                 => 'Penjualan|Penjualan',
+    'purchases'             => 'Pembelian|Pembelian',
 
-    'dashboard'             => 'Dasbor',
-    'welcome'               => 'Welcome',
+    'welcome'               => 'Selamat datang',
     'banking'               => 'Perbankan',
     'general'               => 'Umum',
     'no_records'            => 'Tidak ada catatan.',
@@ -62,16 +64,19 @@ return [
     'no'                    => 'Tidak',
     'na'                    => 'N/A',
     'daily'                 => 'Harian',
-    'weekly'                => 'Weekly',
+    'weekly'                => 'Mingguan',
     'monthly'               => 'Bulanan',
     'quarterly'             => 'Tiga Bulan',
     'yearly'                => 'Tahunan',
     'add'                   => 'Menambahkan',
     'add_new'               => 'Tambah Baru',
+    'add_income'            => 'Tambahkan pendapatan',
+    'add_expense'           => 'Tambahkan Biaya',
     'show'                  => 'Menampilkan',
     'edit'                  => 'Sunting',
     'delete'                => 'Hapus',
     'send'                  => 'Kirim',
+    'share'                 => 'Bagikan',
     'download'              => 'Unduh',
     'delete_confirm'        => 'Konfirmasi hapus :nama :jenis?',
     'name'                  => 'Nama',
@@ -89,11 +94,11 @@ return [
     'reference'             => 'Referensi',
     'attachment'            => 'Lampiran',
     'change'                => 'Perubahan',
-    'change_type'           => 'Change :type',
+    'change_type'           => 'Ubah tipe',
     'switch'                => 'Beralih',
     'color'                 => 'Warna',
     'save'                  => 'Simpan',
-    'confirm'               => 'Confirm',
+    'confirm'               => 'Konfirmasi',
     'cancel'                => 'Batal',
     'loading'               => 'Sedang memuat...',
     'from'                  => 'Dari',
@@ -123,30 +128,47 @@ return [
     'disable'               => 'Nonaktif',
     'select_all'            => 'Pilih Semua',
     'unselect_all'          => 'Batalkan Memilih Semua',
-    'go_to'                 => 'Menuju ke :name',
     'created_date'          => 'Tanggal Dibuat',
     'period'                => 'Periode',
-    'frequency'             => 'Frequency',
+    'frequency'             => 'Frekuensi',
     'start'                 => 'Mulai',
     'end'                   => 'Selesai',
     'clear'                 => 'Hapus',
     'difference'            => 'Perbedaan',
     'footer'                => 'Footer',
-    'start_date'            => 'Start Date',
+    'start_date'            => 'Tanggal Mulai',
+    'end_date'              => 'Tanggal Akhir',
     'basis'                 => 'Basis',
-    'accrual'               => 'Accrual',
-    'cash'                  => 'Cash',
-    'group_by'              => 'Group By',
-    'accounting'            => 'Accounting',
+    'accrual'               => 'akrual',
+    'cash'                  => 'Tunai',
+    'group_by'              => 'Kelompok',
+    'accounting'            => 'Akuntansi',
+    'sort'                  => 'Urutkan',
+    'width'                 => 'lebar',
+    'month'                 => 'Bulan',
+    'year'                  => 'tahun',
+    'type_item_name'        => 'Ketik nama item',
+    'no_data'               => 'Tidak ada data',
+    'no_matching_data'      => 'Tidak ada data yang cocok',
+    'clear_cache'           => 'Hapus Cache',
+    'go_to_dashboard'       => 'Buka dasbor',
+
+    'card' => [
+        'name'                  => 'Nama pada Kartu',
+        'number'                => 'Nomor Kartu',
+        'expiration_date'       => 'Tanggal Kadaluwarsa',
+        'cvv'                   => 'Kartu CVV',
+    ],
 
     'title' => [
         'new'               => 'Baru :type',
         'edit'              => 'Sunting :type',
-        'delete'            => 'Delete :type',
+        'delete'            => 'Hapus: jenis',
         'create'            => 'Buat :type',
         'send'              => 'Kirim :type',
         'get'               => 'Ambil :type',
-        'add'               => 'Add :type',
+        'add'               => 'Tambahkan: jenis',
+        'manage'            => 'Mengelola: jenis',
     ],
 
     'form' => [
@@ -155,7 +177,7 @@ return [
             'field'         => '-Pilih :field -',
             'file'          => 'Pilih Berkas',
         ],
-        'add_new'           => 'Add New :field',
+        'add_new'           => 'Tambah kolom baru',
         'no_file_selected'  => 'Tidak ada Berkas yang dipilih...',
     ],
 
@@ -168,14 +190,17 @@ return [
     ],
 
     'empty' => [
-        'documentation' => 'Check out the <a href=":url" target="_blank" class="text-success">documentation</a> for more details.',
-        'items' => 'Items can be products or services. You can use items when creating invoices and bills to have the price, tax etc fields populated.',
-        'invoices' => 'Invoices can be one time or recurring. You can send them to customers and start accepting online payments.',
-        'revenues' => 'Revenue is a paid income transaction. It can be an independent record (i.e. deposit) or attached to an invoice.',
-        'customers' => 'Customers are required if you want to create invoices. They may also log in to Client Portal and see their balance.',
-        'bills' => 'Bills can be one time or recurring. They indicate what you owe your vendors for the products or services you purchase.',
-        'payments' => 'Payment is a paid expense transaction. It can be an independent record (i.e. food receipt) or attached to a bill.',
-        'vendors' => 'Vendors are required if you want to create bills. You can see the balance you owe and filter reports by the vendor.',
+        'documentation' => 'Periksa <a href=":url" target="_blank"> dokumentasi </a> untuk detail lebih lanjut.',
+        'items' => 'Item dapat berupa produk atau layanan. Anda dapat menggunakan item saat membuat faktur dan tagihan untuk mengisi bidang harga, pajak, dll.',
+        'invoices' => 'Faktur bisa sekali atau berulang. Anda dapat mengirimnya ke pelanggan dan mulai menerima pembayaran online.',
+        'revenues' => 'Pendapatan adalah transaksi pendapatan yang dibayar. Itu bisa berupa catatan independen (mis. Setoran) atau dilampirkan pada faktur.',
+        'customers' => 'Pelanggan diharuskan jika Anda ingin membuat faktur. Mereka juga dapat masuk ke Portal Klien dan melihat saldo mereka.',
+        'bills' => 'Tagihan bisa sekali atau berulang. Mereka menunjukkan apa yang Anda berutang kepada vendor Anda untuk produk atau layanan yang Anda beli.',
+        'payments' => 'Pembayaran adalah transaksi biaya yang dibayarkan. Itu bisa berupa catatan independen (mis. Kwitansi makanan) atau dilampirkan pada tagihan.',
+        'vendors' => 'Vendor diperlukan jika Anda ingin membuat tagihan. Anda dapat melihat saldo Anda berutang dan memfilter laporan oleh vendor.',
+        'transfers' => 'Transfer memungkinkan Anda untuk memindahkan uang dari satu akun ke akun lain, apakah mereka menggunakan mata uang yang sama atau tidak.',
+        'taxes' => 'Pajak digunakan untuk menerapkan biaya tambahan untuk faktur dan tagihan. Keuangan Anda dipengaruhi oleh pajak pengaturan ini.',
+        'reconciliations' => 'Rekonsiliasi bank adalah proses yang dilakukan untuk memastikan bahwa catatan bank perusahaan Anda juga benar.',
     ],
 
 ];
diff --git a/resources/lang/id-ID/install.php b/resources/lang/id-ID/install.php
index 269702674..a5bab95b1 100644
--- a/resources/lang/id-ID/install.php
+++ b/resources/lang/id-ID/install.php
@@ -2,8 +2,8 @@
 
 return [
 
-    'next'                  => 'Selanjutnya',
-    'refresh'               => 'Menyegarkan',
+    'next'                  => 'Berikutnya',
+    'refresh'               => 'Muat Ulang',
 
     'steps' => [
         'requirements'      => 'Silakan meminta penyedia hosting Anda untuk memperbaiki kesalahan!',
@@ -21,13 +21,14 @@ return [
         'disabled'          => ':feature perlu dinonaktifkan!',
         'extension'         => ': ekstensi ekstensi perlu diinstal dan dimuat!',
         'directory'         => ':directory direktori perlu ditulis!',
+        'executable'        => 'The PHP CLI executable file is not defined/working or its version is not :php_version or higher! Please, ask your hosting company to set PHP_BINARY or PHP_PATH environment variable correctly.',
     ],
 
     'database' => [
         'hostname'          => 'Nama host',
         'username'          => 'Nama pengguna',
         'password'          => 'Kata Sandi',
-        'name'              => 'Basis data',
+        'name'              => 'Database',
     ],
 
     'settings' => [
diff --git a/resources/lang/id-ID/invoices.php b/resources/lang/id-ID/invoices.php
index b699af51a..9c2ff55c2 100644
--- a/resources/lang/id-ID/invoices.php
+++ b/resources/lang/id-ID/invoices.php
@@ -13,6 +13,7 @@ return [
     'price'                 => 'Harga',
     'sub_total'             => 'Subtotal',
     'discount'              => 'Diskon',
+    'item_discount'         => 'Potongan Harga',
     'tax_total'             => 'Total Pajak',
     'total'                 => 'Total',
 
@@ -29,6 +30,8 @@ return [
     'add_payment'           => 'Tambahkan Pembayaran',
     'mark_paid'             => 'Ditandai Dibayar',
     'mark_sent'             => 'Tandai Dikirim',
+    'mark_viewed'           => 'Tandai Dilihat',
+    'mark_cancelled'        => 'Tandai dibatalkan',
     'download_pdf'          => 'Unduh PDF',
     'send_mail'             => 'Kirim Email',
     'all_invoices'          => 'Masuk untuk melihat seluruh faktur',
@@ -39,23 +42,28 @@ return [
 
     'statuses' => [
         'draft'             => 'Konsep',
-        'sent'              => 'Mengirim',
-        'viewed'            => 'Lihat',
+        'sent'              => 'Terkirim',
+        'viewed'            => 'Dilihat',
         'approved'          => 'Disetujui',
         'partial'           => 'Sebagian',
         'paid'              => 'Dibayar',
+        'overdue'           => 'Jatuh Tempo',
+        'unpaid'            => 'Belum Dibayar',
+        'cancelled'         => 'Dibatalkan',
     ],
 
     'messages' => [
-        'email_sent'        => 'Invoice email has been sent!',
-        'marked_sent'       => 'Invoice marked as sent!',
-        'marked_paid'       => 'Invoice marked as paid!',
+        'email_sent'        => 'Email faktur telah dikirim!',
+        'marked_sent'       => 'Faktur ditandai sebagai terkirim!',
+        'marked_paid'       => 'Faktur ditandai sebagai berbayar!',
+        'marked_viewed'     => 'Tagihan ditandai sudah dilihat',
+        'marked_cancelled'  => 'Tagihan ditandai sudah dibatalkan',
         'email_required'    => 'Tidak ada alamat email untuk pelanggan ini!',
         'draft'             => 'Faktur ini merupakan <b>DRAFT</b> dan akan terlihat pada grafik ketika sudah dibayarkan',
 
         'status' => [
             'created'       => 'Dibuat pada :date',
-            'viewed'        => 'Viewed',
+            'viewed'        => 'Dilihat',
             'send' => [
                 'draft'     => 'Tidak terkirim',
                 'sent'      => 'Terkirim pada :date',
diff --git a/resources/lang/id-ID/maintenance.php b/resources/lang/id-ID/maintenance.php
index 08d595e60..eda6c79b4 100644
--- a/resources/lang/id-ID/maintenance.php
+++ b/resources/lang/id-ID/maintenance.php
@@ -2,10 +2,10 @@
 
 return [
 
-    'title' => 'Maintenance Mode',
+    'title' => 'Dalam perbaikan',
 
-    'message' => 'We\'re currently working on the site, please try again later!',
+    'message' => 'Maaf, kami sedang dalam perbaikan. Silakan coba lagi nanti!',
 
-    'last-updated' => 'This message was last updated :timestamp',
+    'last-updated' => 'Pesan ini telah diperbarui: timestamp.',
 
-];
\ No newline at end of file
+];
diff --git a/resources/lang/id-ID/messages.php b/resources/lang/id-ID/messages.php
index 826447821..4bf78a464 100644
--- a/resources/lang/id-ID/messages.php
+++ b/resources/lang/id-ID/messages.php
@@ -8,6 +8,7 @@ return [
         'deleted'           => ':type dihapus!',
         'duplicated'        => ':type duplikat!',
         'imported'          => ':type diimpor!',
+        'exported'          => ':type diimpor!',
         'enabled'           => ':type diaktifkan!',
         'disabled'          => ':type dinonaktifkan!',
     ],
@@ -18,8 +19,8 @@ return [
         'customer'          => 'Galat: Pengguna tidak dibuat! :name telah menggunakan alamat email ini.',
         'no_file'           => 'Kesalahan: Tidak ada file dipilih!',
         'last_category'     => 'Error: Tidak dapat menghapus kategori :type terakhir!',
-        'change_type'       => 'Error: Can not change the type because it has :text related!',
-        'invalid_apikey'    => 'Error: The API Key entered is invalid!',
+        'change_type'       => 'Kesalahan: Tidak dapat mengubah jenis karena memiliki: teks terkait!',
+        'invalid_apikey'    => 'Galat: Token yang dimasukkan tidak sah!',
         'import_column'     => 'Error: :message Nama sheet: :sheet. Baris ke :line.',
         'import_sheet'      => 'Error: Nama sheet tidak valid. Mohon untuk memeriksa contoh file yang tersedia.',
     ],
@@ -27,8 +28,10 @@ return [
     'warning' => [
         'deleted'           => 'PeringatanL: Anda tidak boleh menghapus <b>:name</b> karena memiliki :text terkaitan.',
         'disabled'          => 'Peringatan: Anda tidak boleh menonaktifkan<b>:name</b> karena memiliki :text terkaitan.',
+        'reconciled_tran'   => 'Perhatian: tidak diperbolehkan merubah/ menghapus transaksi karena sudah direkonsilasi',
+        'reconciled_doc'    => 'Perhatian: tidak diperbolehkan merubah/ menghapus :type karena transaksi sudah direkonsilasi',
         'disable_code'      => 'Peringatan: Anda tidak diizinkan untuk menonaktifkan atau mengubah kurs <b>:name</b> karena memiliki keterkaitan dengan :text.',
-        'payment_cancel'    => 'Warning: You have cancelled your recent :method payment!',
+        'payment_cancel'    => 'Peringatan: kamu tidak dapat membatalkan :metode pembayaran!',
     ],
 
 ];
diff --git a/resources/lang/id-ID/modules.php b/resources/lang/id-ID/modules.php
index e27efe768..ca9036b47 100644
--- a/resources/lang/id-ID/modules.php
+++ b/resources/lang/id-ID/modules.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'api_key'               => 'API Key',
+    'api_key'               => 'Kunci API',
     'my_apps'               => 'Aplikasi saya',
     'pre_sale'              => 'Pra Penjualan',
     'top_paid'              => 'Dibayar atas',
@@ -12,10 +12,9 @@ return [
     'search'                => 'Cari',
     'install'               => 'Pasang',
     'buy_now'               => 'Beli Sekarang',
-    'api_key_link'          => '<a class="text-red" href="https://akaunting.com/profile" target="_blank">Click here</a> to get your API key.',
+    'get_api_key'           => '<a href=":url" target="_blank">Klik disini</a> untuk mendapatkan Kunci API.',
     'no_apps'               => 'Belum ada aplikasi dalam kategori ini.',
-    'developer'             => 'Are you a developer? <a href="https://akaunting.com/developers" target="_blank">Here</a> you can learn how to create an app and start selling today!',
-
+    'become_developer'      => 'Apakah Anda seorang pengembang? <a href=":url" target="_blank"> Di Sini </a> Anda dapat belajar cara membuat aplikasi dan mulai menjual hari ini!',
     'recommended_apps'      => 'Aplikasi yang direkomendasikan',
 
     'about'                 => 'Tentang',
@@ -42,20 +41,20 @@ return [
 
     'installation' => [
         'header'            => 'Instalasi Aplikasi',
-        'download'          => 'Downloading :module',
-        'unzip'             => 'Extracting :module files',
-        'file_copy'         => 'Copying :module files',
-        'finish'            => 'Finalizing :module installation',
-        'redirect'          => ':module installed, redirecting to updates page',
-        'install'           => 'Installing :module',
+        'download'          => 'Mengunduh :module',
+        'unzip'             => 'Mengekstrak :module file.',
+        'file_copy'         => 'Menyalin file :module.',
+        'finish'            => 'Finalisasi: pemasangan modul',
+        'redirect'          => ': modul terpasang, mengarahkan ke halaman pembaruan',
+        'install'           => 'Memasang: modul',
     ],
 
     'errors' => [
-        'download'          => 'Not able to download :module',
-        'zip'               => 'Not able to create :module zip file',
-        'unzip'             => 'Not able to unzip :module',
-        'file_copy'         => 'Not able to copy :module files',
-        'finish'            => 'Not able to finalize :module installation',
+        'download'          => 'Tidak dapat mengunduh: modul',
+        'zip'               => 'Tidak dapat membuat: file zip modul',
+        'unzip'             => 'Tidak dapat unzip: modul',
+        'file_copy'         => 'Tidak dapat menyalin: file modul',
+        'finish'            => 'Tidak dapat menyelesaikan: pemasangan modul',
     ],
 
     'badge' => [
@@ -80,5 +79,6 @@ return [
         ],
 
         'na'                => 'Tidak ada ulasan.'
-    ]
+    ],
+
 ];
diff --git a/resources/lang/id-ID/pagination.php b/resources/lang/id-ID/pagination.php
index 363637bfd..55e5d4721 100644
--- a/resources/lang/id-ID/pagination.php
+++ b/resources/lang/id-ID/pagination.php
@@ -2,9 +2,9 @@
 
 return [
 
-    'previous'              => '&laquo; Sebelumnya',
-    'next'                  => 'Berikutnya &raquo;',
+    'previous'              => 'Sebelumnya',
+    'next'                  => 'Berikutnya',
     'showing'               => ':first-:last of :total records.',
-    'page'                  => 'per page.',
+    'page'                  => 'per halaman.',
 
 ];
diff --git a/resources/lang/id-ID/passwords.php b/resources/lang/id-ID/passwords.php
index 074dc2a21..049fc45d9 100644
--- a/resources/lang/id-ID/passwords.php
+++ b/resources/lang/id-ID/passwords.php
@@ -18,5 +18,6 @@ return [
     'sent' => 'Kami sudah mengirim email yang berisi tautan untuk mereset kata sandi Anda!',
     'token' => 'Kata sandi token pengaturan ulang tidak sah.',
     'user' => "Kami tidak dapat menemukan pengguna dengan alamat surel tersebut.",
+    'throttle' => 'Please wait before retrying.',
 
 ];
diff --git a/resources/lang/id-ID/reconciliations.php b/resources/lang/id-ID/reconciliations.php
index 8d1ffd99c..737de2dbd 100644
--- a/resources/lang/id-ID/reconciliations.php
+++ b/resources/lang/id-ID/reconciliations.php
@@ -6,7 +6,7 @@ return [
     'reconciled'            => 'Terekonsiliasi',
     'closing_balance'       => 'Saldo Akhir',
     'unreconciled'          => 'Tidak Terekonsiliasi',
-    'transactions'          => 'Transactions',
+    'transactions'          => 'Transaksi',
     'start_date'            => 'Tanggal Mulai',
     'end_date'              => 'Tanggal Berakhir',
     'cleared_amount'        => 'Jumlah yang dihapus',
diff --git a/resources/lang/id-ID/reports.php b/resources/lang/id-ID/reports.php
index bdb0b4b0f..85a44e2fe 100644
--- a/resources/lang/id-ID/reports.php
+++ b/resources/lang/id-ID/reports.php
@@ -12,7 +12,7 @@ return [
     'net_profit'            => 'Laba Bersih',
     'total_expenses'        => 'Total Pengeluaran',
     'net'                   => 'Laba Bersih',
-    'income-expense'        => 'Income & Expense',
+    'income_expense'        => 'Pendapatan & Pengeluaran',
 
     'summary' => [
         'income'            => 'Ringkasan Pendapatan',
@@ -22,9 +22,9 @@ return [
     ],
 
     'charts' => [
-        'line'              => 'Line',
-        'bar'               => 'Bar',
-        'pie'               => 'Pie',
+        'line'              => 'Baris',
+        'bar'               => 'Batang',
+        'pie'               => 'Lingkaran',
     ],
 
 ];
diff --git a/resources/lang/id-ID/settings.php b/resources/lang/id-ID/settings.php
index 2c6e97c5b..0d993ff92 100644
--- a/resources/lang/id-ID/settings.php
+++ b/resources/lang/id-ID/settings.php
@@ -12,7 +12,7 @@ return [
     ],
 
     'localisation' => [
-        'description'       => 'Set fiscal year, time zone, date format and more locals',
+        'description'       => 'Tetapkan tahun fiskal, zona waktu, format tanggal dan lebih banyak penduduk lokal',
         'financial_start'   => 'Waktu mulai Periode Keuangan',
         'timezone'          => 'Zona Waktu',
         'date' => [
@@ -29,10 +29,16 @@ return [
             'before'        => 'Sebelum Nomor',
             'after'         => 'Sesudah Nomor',
         ],
+        'discount_location' => [
+            'name'          => 'Lokasi Diskon',
+            'item'          => 'pada baris',
+            'total'         => 'Pada jumlah',
+            'both'          => 'Pada baris dan jumlah',
+        ],
     ],
 
     'invoice' => [
-        'description'       => 'Customize invoice prefix, number, terms, footer etc',
+        'description'       => 'Kustomisasi awalan faktur, nomor, syarat, catatan kaki dll',
         'prefix'            => 'Prefix Nomor',
         'digit'             => 'Digit nomor',
         'next'              => 'Nomor Berikutnya',
@@ -52,16 +58,20 @@ return [
         'subheading'        => 'Subjudul',
         'due_receipt'       => 'Jatuh tempo saat diterima',
         'due_days'          => 'Jatuh tempo dalam :days hari',
+        'choose_template'   => 'Pilih template faktur',
+        'default'           => 'Default',
+        'classic'           => 'Klasik',
+        'modern'            => 'Modern',
     ],
 
     'default' => [
-        'description'       => 'Default account, currency, language of your company',
-        'list_limit'        => 'Records Per Page',
-        'use_gravatar'      => 'Use Gravatar',
+        'description'       => 'Akun default, mata uang, bahasa perusahaan Anda',
+        'list_limit'        => 'Data Per Laman',
+        'use_gravatar'      => 'Gunakan Gravatar',
     ],
 
     'email' => [
-        'description'       => 'Change the sending protocol and email templates',
+        'description'       => 'Ubah protokol pengiriman dan templat email',
         'protocol'          => 'Protokol',
         'php'               => 'PHP Mail',
         'smtp' => [
@@ -78,24 +88,24 @@ return [
         'log'               => 'Log Email',
 
         'templates' => [
-            'subject'                   => 'Subject',
-            'body'                      => 'Body',
-            'tags'                      => '<strong>Available Tags:</strong> :tag_list',
-            'invoice_new_customer'      => 'New Invoice Template (sent to customer)',
-            'invoice_remind_customer'   => 'Invoice Reminder Template (sent to customer)',
-            'invoice_remind_admin'      => 'Invoice Reminder Template (sent to admin)',
-            'invoice_recur_customer'    => 'Invoice Recurring Template (sent to customer)',
-            'invoice_recur_admin'       => 'Invoice Recurring Template (sent to admin)',
-            'invoice_payment_customer'  => 'Payment Received Template (sent to customer)',
-            'invoice_payment_admin'     => 'Payment Received Template (sent to admin)',
-            'bill_remind_admin'         => 'Bill Reminder Template (sent to admin)',
-            'bill_recur_admin'          => 'Bill Recurring Template (sent to admin)',
+            'subject'                   => 'Subjek',
+            'body'                      => 'Badan',
+            'tags'                      => '<strong> Tag yang Tersedia: </strong>: tag_list',
+            'invoice_new_customer'      => 'Templat Faktur Baru (dikirim ke pelanggan)',
+            'invoice_remind_customer'   => 'Templat Pengingat Faktur (dikirim ke pelanggan)',
+            'invoice_remind_admin'      => 'Templat Pengingat Faktur (dikirim ke admin)',
+            'invoice_recur_customer'    => 'Templat Berulang Faktur (dikirim ke pelanggan)',
+            'invoice_recur_admin'       => 'Templat Berulang Faktur (dikirim ke admin)',
+            'invoice_payment_customer'  => 'Template Penerimaan Pembayaran (dikirim ke pelanggan)',
+            'invoice_payment_admin'     => 'Template Penerimaan Pembayaran (dikirim ke admin)',
+            'bill_remind_admin'         => 'Templat Pengingat Tagihan (dikirim ke admin)',
+            'bill_recur_admin'          => 'Templat Perulangan Tagihan (dikirim ke admin)',
         ],
     ],
 
     'scheduling' => [
-        'name'              => 'Scheduling',
-        'description'       => 'Automatic reminders and command for recurring',
+        'name'              => 'Penjadwalan',
+        'description'       => 'Pengingat dan perintah otomatis untuk berulang',
         'send_invoice'      => 'Kirim Pengingat Faktur',
         'invoice_days'      => 'Kirim Setelah Jatuh Tempo',
         'send_bill'         => 'Kirim Pengingat Tagihan',
@@ -105,15 +115,15 @@ return [
     ],
 
     'categories' => [
-        'description'       => 'Unlimited categories for income, expense, and item',
+        'description'       => 'Kategori tidak terbatas untuk penghasilan, pengeluaran, dan barang',
     ],
 
     'currencies' => [
-        'description'       => 'Create and manage currencies and set their rates',
+        'description'       => 'Buat dan kelola mata uang dan tetapkan nilainya',
     ],
 
     'taxes' => [
-        'description'       => 'Fixed, normal, inclusive, and compound tax rates',
+        'description'       => 'Tarif pajak tetap, normal, inklusif, dan gabungan',
     ],
 
 ];
diff --git a/resources/lang/id-ID/taxes.php b/resources/lang/id-ID/taxes.php
index a50279638..1c66a265d 100644
--- a/resources/lang/id-ID/taxes.php
+++ b/resources/lang/id-ID/taxes.php
@@ -7,5 +7,5 @@ return [
     'normal'                => 'Normal',
     'inclusive'             => 'Inklusif',
     'compound'              => 'Campuran',
-    'fixed'                 => 'Fixed',
+    'fixed'                 => 'Diperbaiki',
 ];
diff --git a/resources/lang/id-ID/validation.php b/resources/lang/id-ID/validation.php
index 683b53e68..5371b4a46 100644
--- a/resources/lang/id-ID/validation.php
+++ b/resources/lang/id-ID/validation.php
@@ -100,10 +100,11 @@ return [
 
     'custom' => [
         'attribute-name' => [
-            'rule-name' => 'kustomisasi-pesan',
+            'rule-name'             => 'kustomisasi-pesan',
         ],
-        'invalid_currency' => ':attribute kode tidak valid.',
-        'invalid_amount'   => 'Jumlah :attribute tidak valid.',
+        'invalid_currency'      => ':attribute kode tidak valid.',
+        'invalid_amount'        => 'Jumlah :attribute tidak valid.',
+        'invalid_extension'     => 'Ekstensi file tidak valid',
     ],
 
     /*
diff --git a/resources/lang/it-IT/install.php b/resources/lang/it-IT/install.php
index 972e26c06..fc6603a16 100644
--- a/resources/lang/it-IT/install.php
+++ b/resources/lang/it-IT/install.php
@@ -21,7 +21,7 @@ return [
         'disabled'          => ':feature deve essere disabilitata!',
         'extension'         => ':extension estensione deve essere installata e caricata!',
         'directory'         => 'la cartella :directory deve essere scrivibile!',
-        'executable'        => 'Il file eseguibile PHP CLI non funziona! Si prega di chiedere alla società di hosting di impostare correttamente la variabile d\'ambiente PHP_BINARY o PHP_PATH.',
+        'executable'        => 'Il file eseguibile PHP CLI non è definito/non funziona o la versione non è :php_version o superiore! Si prega di chiedere alla società di hosting di impostare correttamente la variabile d\'ambiente PHP_BINARY o PHP_PATH.',
     ],
 
     'database' => [
diff --git a/resources/lang/ja-JP/bills.php b/resources/lang/ja-JP/bills.php
index 91b5fe4a8..d1d1eafc9 100644
--- a/resources/lang/ja-JP/bills.php
+++ b/resources/lang/ja-JP/bills.php
@@ -13,6 +13,7 @@ return [
     'price'                 => '価格',
     'sub_total'             => '小計',
     'discount'              => '割引',
+    'item_discount'         => 'ライン割引',
     'tax_total'             => '税合計',
     'total'                 => '合計',
 
@@ -28,7 +29,9 @@ return [
     'histories'             => '記録',
     'payments'              => '支払い',
     'add_payment'           => '支払いを追加',
+    'mark_paid'             => '有給マーク',
     'mark_received'         => '受信マーク',
+    'mark_cancelled'        => 'キャンセル済みとマーク',
     'download_pdf'          => 'PDFをダウンロード',
     'send_mail'             => 'メールを送る',
     'create_bill'           => '請求書を作成',
@@ -42,10 +45,14 @@ return [
         'paid'              => '支払済み',
         'overdue'           => '遅れた',
         'unpaid'            => '未払い',
+        'cancelled'         => 'キャンセル',
     ],
 
     'messages' => [
-        'received'          => '請求書は正常に受信されたとマークされました。',
+        'marked_received'   => 'ビルは受領済みとしてマークされました！',
+        'marked_paid'       => '支払い済みとしてマークされたビル！',
+        'marked_cancelled'  => 'ビルはキャンセル済みとマークされました!
+',
         'draft'             => 'これは<b>ドラフト</b>請求書で、受け取り後にチャートに反映されます。',
 
         'status' => [
diff --git a/resources/lang/ja-JP/bulk_actions.php b/resources/lang/ja-JP/bulk_actions.php
index 7d3b70bf5..dcdbadd03 100644
--- a/resources/lang/ja-JP/bulk_actions.php
+++ b/resources/lang/ja-JP/bulk_actions.php
@@ -2,8 +2,9 @@
 
 return [
 
-    'bulk_actions'     => '一括アクション|一括アクション',
-    'selected'         => '選択中',
+    'bulk_actions'      => '一括アクション|一括アクション',
+    'selected'          => '選択中',
+    'no_action'         => '利用可能なアクションはありません',
 
     'message' => [
         'duplicate'     => '選択したレコードを<b>複製</b>してもよろしいですか?',
@@ -14,6 +15,8 @@ return [
         'paid'          => '選択した請求書にマークを付けてもよろしいですか <b>支払った</b>?|選択した請求書にマークを付けてもよろしいですか<b>支払った</b>?',
         'sent'          => '選択した請求書にマークを付けてもよろしいですか <b>送った</b>?|選択した請求書にマークを付けてもよろしいですか<b>送った</b>?',
         'received'      => '選択した請求書にマークを付けてもよろしいですか <b>受け取った</b>?|選択した請求書にマークを付けてもよろしいですか<b>受け取った</b>?',
+        'cancelled'     => '本当によろしいですか <b>キャンセル</b> 選択された請求書/請求書?|本当によろしいですか <b>キャンセル</b> 選択された請求書/請求書?
+',
     ],
 
 ];
diff --git a/resources/lang/ja-JP/install.php b/resources/lang/ja-JP/install.php
index ec447d749..8138ad440 100644
--- a/resources/lang/ja-JP/install.php
+++ b/resources/lang/ja-JP/install.php
@@ -21,6 +21,7 @@ return [
         'disabled'          => ':feature 無効にする必要があります！',
         'extension'         => ':extension エクステンション 拡張機能をインストールしてロードする必要があります!',
         'directory'         => ':directory ディレクトリは書き込み可能である必要があります!',
+        'executable'        => 'The PHP CLI executable file is not defined/working or its version is not :php_version or higher! Please, ask your hosting company to set PHP_BINARY or PHP_PATH environment variable correctly.',
     ],
 
     'database' => [
diff --git a/resources/lang/ja-JP/invoices.php b/resources/lang/ja-JP/invoices.php
index af8096b07..cf04788ba 100644
--- a/resources/lang/ja-JP/invoices.php
+++ b/resources/lang/ja-JP/invoices.php
@@ -13,6 +13,7 @@ return [
     'price'                 => '価格',
     'sub_total'             => '小計',
     'discount'              => '割引',
+    'item_discount'         => 'ライン割引',
     'tax_total'             => '税合計',
     'total'                 => '合計',
 
@@ -30,6 +31,7 @@ return [
     'mark_paid'             => 'マークペイド',
     'mark_sent'             => '送信済みマーク',
     'mark_viewed'           => 'マーク済み',
+    'mark_cancelled'        => 'キャンセル済みとマーク',
     'download_pdf'          => 'PDFをダウンロード',
     'send_mail'             => 'メールを送る',
     'all_invoices'          => 'すべての請求書を表示するにはログインしてください',
@@ -47,12 +49,15 @@ return [
         'paid'              => '支払済み',
         'overdue'           => '遅れた',
         'unpaid'            => '未払い',
+        'cancelled'         => 'キャンセルしました',
     ],
 
     'messages' => [
         'email_sent'        => '請求書メールが送信されました！',
         'marked_sent'       => '請求書が送信済みとしてマークされました！',
         'marked_paid'       => '支払済みとしてマークされた請求書！',
+        'marked_viewed'     => '請求書は閲覧済みとしてマークされました！',
+        'marked_cancelled'  => 'キャンセル済みとしてマークされた請求書！',
         'email_required'    => 'この顧客のメールアドレスはありません。',
         'draft'             => 'これは <b>ドラフト</b>請求書で、送信後にチャートに反映されます。',
 
diff --git a/resources/lang/ja-JP/messages.php b/resources/lang/ja-JP/messages.php
index 8d8fa1eda..ecd252cdc 100644
--- a/resources/lang/ja-JP/messages.php
+++ b/resources/lang/ja-JP/messages.php
@@ -28,6 +28,8 @@ return [
     'warning' => [
         'deleted'           => '警告: 削除することはできません <b>:name</b> テキストに関連しているからです。 :text related.',
         'disabled'          => '警告: 無効にすることはできません <b>:name</b>テキストに関連しているため :text related.',
+        'reconciled_tran'   => '警告：調整されているため、トランザクションを変更/削除することはできません！',
+        'reconciled_doc'    => '警告：トランザクションが調整されているため、:type を変更/削除することはできません！',
         'disable_code'      => '警告: 通貨を無効化または変更することはできません <b>:name</b> のため :text related.',
         'payment_cancel'    => '警告：最近キャンセルされた：お支払い方法！',
     ],
diff --git a/resources/lang/ja-JP/passwords.php b/resources/lang/ja-JP/passwords.php
index d1f081c8c..e8666e510 100644
--- a/resources/lang/ja-JP/passwords.php
+++ b/resources/lang/ja-JP/passwords.php
@@ -18,5 +18,6 @@ return [
     'sent' => 'パスワードリマインダーを送信しました。',
     'token' => 'このパスワードリセットトークンは無効です。',
     'user' => "このメールアドレスに一致するユーザーを見つけることが出来ませんでした。",
+    'throttle' => '再試行する前にお待ちください。',
 
 ];
diff --git a/resources/lang/ja-JP/settings.php b/resources/lang/ja-JP/settings.php
index 41cc6cb47..a272cd827 100644
--- a/resources/lang/ja-JP/settings.php
+++ b/resources/lang/ja-JP/settings.php
@@ -29,6 +29,12 @@ return [
             'before'        => '番号の前に',
             'after'         => '番号の後',
         ],
+        'discount_location' => [
+            'name'          => '割引の場所',
+            'item'          => 'ラインで',
+            'total'         => '合計で',
+            'both'          => 'ラインと合計の両方',
+        ],
     ],
 
     'invoice' => [
diff --git a/resources/lang/ja-JP/validation.php b/resources/lang/ja-JP/validation.php
index c1c0dd386..52e3fb8ee 100644
--- a/resources/lang/ja-JP/validation.php
+++ b/resources/lang/ja-JP/validation.php
@@ -100,10 +100,11 @@ return [
 
     'custom' => [
         'attribute-name' => [
-            'rule-name' => 'カスタム メッセージ',
+            'rule-name'             => 'カスタム メッセージ',
         ],
-        'invalid_currency' => '：属性コードが無効です。',
-        'invalid_amount'   => '総額：属性が無効です。',
+        'invalid_currency'      => '：属性コードが無効です。',
+        'invalid_amount'        => '総額：属性が無効です。',
+        'invalid_extension'     => 'ファイル拡張子が無効です。',
     ],
 
     /*
diff --git a/resources/lang/pt-BR/install.php b/resources/lang/pt-BR/install.php
index f6572a453..565d53f4f 100644
--- a/resources/lang/pt-BR/install.php
+++ b/resources/lang/pt-BR/install.php
@@ -21,7 +21,7 @@ return [
         'disabled'          => ':feature precisa esta desabilitado!',
         'extension'         => 'Extensão :extension precisa ser instalado e carregado!',
         'directory'         => 'O diretório :directory precisa de permissão para escrita!',
-        'executable'        => 'O arquivo executável PHP CLI não está funcionando! Por favor, peça à sua empresa de hospedagem para definir a variável PHP_BINARY ou PHP_PATH de ambiente corretamente.',
+        'executable'        => 'O arquivo executável do PHP CLI não está definido/funcionando ou sua versão não é :php_version ou superior! Por favor, peça à sua empresa de hospedagem que defina corretamente a variável de ambiente PHP_BINARY ou PHP_PATH.',
     ],
 
     'database' => [
diff --git a/resources/lang/sq-AL/bills.php b/resources/lang/sq-AL/bills.php
index 4f1401a74..570cb7942 100644
--- a/resources/lang/sq-AL/bills.php
+++ b/resources/lang/sq-AL/bills.php
@@ -13,6 +13,7 @@ return [
     'price'                 => 'Çmimi',
     'sub_total'             => 'Nëntotali',
     'discount'              => 'Skonto',
+    'item_discount'         => 'Linjë Zbritje',
     'tax_total'             => 'Tatimi Gjithsej',
     'total'                 => 'Totali',
 
@@ -30,6 +31,7 @@ return [
     'add_payment'           => 'Shto Pagesë',
     'mark_paid'             => 'Shënoje të Paguar',
     'mark_received'         => 'Shënoje të Marrë',
+    'mark_cancelled'        => 'Shënoje të Anuluar',
     'download_pdf'          => 'Shkarko PDF',
     'send_mail'             => 'Dërgo Email',
     'create_bill'           => 'Krijo Faturë',
@@ -43,11 +45,13 @@ return [
         'paid'              => 'I paguar',
         'overdue'           => 'I vonuar',
         'unpaid'            => 'I papaguar',
+        'cancelled'         => 'Anuluar',
     ],
 
     'messages' => [
-        'received'          => 'Fatura shënohet si i marrë me sukses!',
+        'marked_received'   => 'Fatura e shënuar si e marrë!',
         'marked_paid'       => 'Fatura e shënuar si e paguar!',
+        'marked_cancelled'  => 'Fatura e shënuar si e anuluar!',
         'draft'             => 'Ky është një faturë <b>DRAFT</b> dhe do të pasqyrohet në skema pas marrjes së tij.',
 
         'status' => [
diff --git a/resources/lang/sq-AL/bulk_actions.php b/resources/lang/sq-AL/bulk_actions.php
index c4285e9e3..46ec7e468 100644
--- a/resources/lang/sq-AL/bulk_actions.php
+++ b/resources/lang/sq-AL/bulk_actions.php
@@ -15,6 +15,7 @@ return [
         'paid'          => 'Jeni i sigurt që doni të shënoni faturën e zgjedhur si të <b>paguar</b>?|Jeni i sigurt që doni të shënoni faturat e zgjedhura si të <b>paguara</b>?',
         'sent'          => 'Jeni i sigurt që doni të shënoni faturën e zgjedhur si të <b>dërguar</b>?|Jeni i sigurt që doni të shënoni faturat e zgjedhura si të <b>dërguara</b>?',
         'received'      => 'Jeni i sigurt që doni të shënoni faturën e zgjedhur si të <b>pranuar</b>?|Jeni i sigurt që doni të shënoni faturat e zgjedhura si të <b>pranuara</b>?',
+        'cancelled'     => 'Jeni i sigurt që doni të <b>anuloni</b> faturën e zgjedhur?|Jeni i sigurt që doni të <b>anuloni</b> faturat e zgjedhura?',
     ],
 
 ];
diff --git a/resources/lang/sq-AL/install.php b/resources/lang/sq-AL/install.php
index b21629872..c3ad2385c 100644
--- a/resources/lang/sq-AL/install.php
+++ b/resources/lang/sq-AL/install.php
@@ -21,6 +21,7 @@ return [
         'disabled'          => ':feature duhet të çaktivizohet!',
         'extension'         => ':extension shtesa duhet të instalohet dhe të ngarkohet!',
         'directory'         => ':directory lista duhet të jetë e shkrueshme!',
+        'executable'        => 'Skedari i ekzekutueshëm i PHP CLI nuk po funksionon ose versioni i tij nuk është :php_version ose më i lartë! Ju lutemi, pyetni kompaninë tuaj hosting që të vendosin në mënyrë korrekte vlerat e mjedisit PHP_BINARY ose PHP_PATH.',
     ],
 
     'database' => [
diff --git a/resources/lang/sq-AL/invoices.php b/resources/lang/sq-AL/invoices.php
index 136f161dc..ec5bd5219 100644
--- a/resources/lang/sq-AL/invoices.php
+++ b/resources/lang/sq-AL/invoices.php
@@ -13,6 +13,7 @@ return [
     'price'                 => 'Çmimi',
     'sub_total'             => 'Nëntotali',
     'discount'              => 'Skonto',
+    'item_discount'         => 'Linjë Zbritje',
     'tax_total'             => 'Tatimi Gjithsej',
     'total'                 => 'Totali',
 
@@ -30,6 +31,7 @@ return [
     'mark_paid'             => 'Shënoje të Paguar',
     'mark_sent'             => 'Shënoje të Dërguar',
     'mark_viewed'           => 'Shënoje të Shikuar',
+    'mark_cancelled'        => 'Shënoje të Anuluar',
     'download_pdf'          => 'Shkarko PDF',
     'send_mail'             => 'Dërgo Email',
     'all_invoices'          => 'Identifikohu për të parë të gjitha faturat',
@@ -47,12 +49,15 @@ return [
         'paid'              => 'I paguar',
         'overdue'           => 'I vonuar',
         'unpaid'            => 'I papaguar',
+        'cancelled'         => 'Anuluar',
     ],
 
     'messages' => [
         'email_sent'        => 'Emaili i faturës është dërguar!',
         'marked_sent'       => 'Fatura e shënuar si e dërguar!',
         'marked_paid'       => 'Fatura e shënuar si e paguar!',
+        'marked_viewed'     => 'Fatura e shënuar si e shikuar!',
+        'marked_cancelled'  => 'Fatura e shënuar si e anuluar!',
         'email_required'    => 'Ska adresë e-mail për këtë klient!',
         'draft'             => 'Kjo është një faturë <b>DRAFT</b> dhe do të pasqyrohet në skema pasi të jetë dërguar.',
 
diff --git a/resources/lang/sq-AL/settings.php b/resources/lang/sq-AL/settings.php
index d2622f9bf..ec711243a 100644
--- a/resources/lang/sq-AL/settings.php
+++ b/resources/lang/sq-AL/settings.php
@@ -29,6 +29,12 @@ return [
             'before'        => 'Para Numrit',
             'after'         => 'Pas Numrit',
         ],
+        'discount_location' => [
+            'name'          => 'Vendndodhja e Zbritjes',
+            'item'          => 'Në rresht',
+            'total'         => 'Në total',
+            'both'          => 'Në rresht dhe në total',
+        ],
     ],
 
     'invoice' => [
diff --git a/resources/lang/tr-TR/email_templates.php b/resources/lang/tr-TR/email_templates.php
index f3cbb6452..cfc027526 100644
--- a/resources/lang/tr-TR/email_templates.php
+++ b/resources/lang/tr-TR/email_templates.php
@@ -3,7 +3,7 @@
 return [
 
     'invoice_new_customer' => [
-        'subject'       => '{invoice_number} fatura uluşturuldu',
+        'subject'       => '{invoice_number} fatura oluşturuldu',
         'body'          => 'Sayın {customer_name},<br /><br /><strong>{invoice_number}</strong> numarası ile faturanızı hazırladık.<br /><br />Aşağıdaki bağlantıdan faturanın detaylarını görüntüleyip ödemesini online olarak kredi/banka kartınızla yapabilirsiniz: <a href="{invoice_guest_link}">{invoice_number}</a>.<br /><br />Herhangi bir sorunuz olursa lütfen bize yazın.<br /><br />Kolay gelsin,<br />{company_name}',
     ],
 
diff --git a/resources/lang/tr-TR/install.php b/resources/lang/tr-TR/install.php
index 61828ed29..ff9417118 100644
--- a/resources/lang/tr-TR/install.php
+++ b/resources/lang/tr-TR/install.php
@@ -21,7 +21,7 @@ return [
         'disabled'          => ':feature devre dışı bırakılmalıdır!',
         'extension'         => ':extension eklendisi kurulmalı ve yüklenmelidir!',
         'directory'         => ':directory dizini yazılabilir olmalıdır!',
-        'executable'        => 'PHP CLI çalıştırıcısı çalışmıyor. Lütfen, hosting firmanızdan PHP_BINARY veya PHP_PATH ortam değerlerini doğru ayarlamasını isteyin.',
+        'executable'        => 'PHP CLI çalıştırıcısı bulunamadı veya çalışmıyor veya sürümü :php_version ve üstü değil. Lütfen, hosting firmanızdan PHP_BINARY veya PHP_PATH ortam değerlerini doğru ayarlamasını isteyin.',
     ],
 
     'database' => [
diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php
index ca10a00cf..cbbf20535 100644
--- a/resources/views/layouts/admin.blade.php
+++ b/resources/views/layouts/admin.blade.php
@@ -2,7 +2,12 @@
 
     @include('partials.admin.head')
 
-    <body id="leftMenu" class="g-sidenav-show g-sidenav-pinned">
+    @mobile
+        <body id="leftMenu" class="g-sidenav-hidden">	
+    @elsemobile	
+        <body id="leftMenu" class="g-sidenav-show">	
+    @endmobile
+
         @stack('body_start')
 
         @include('partials.admin.menu')
diff --git a/resources/views/partials/admin/menu.blade.php b/resources/views/partials/admin/menu.blade.php
index 80d88acc0..2bcacf44f 100644
--- a/resources/views/partials/admin/menu.blade.php
+++ b/resources/views/partials/admin/menu.blade.php
@@ -1,14 +1,13 @@
 @stack('menu_start')
-    <nav class="sidenav navbar navbar-vertical fixed-left navbar-expand-sm navbar-light bg-default" id="sidenav-main">
+    <nav class="sidenav navbar navbar-vertical fixed-left navbar-expand-xs navbar-light bg-default" id="sidenav-main">
         <div class="scrollbar-inner">
-            <div class="sidenav-header d-flex align-items-center ml-4">
+            <div class="sidenav-header d-flex align-items-center">
                 <ul class="navbar-nav">
                     <li class="nav-item dropdown">
                         <a class="nav-link" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             <span class="avatar menu-avatar background-unset">
                                 <img class="border-radius-none border-0 mr-3" alt="Akaunting" src="{{ asset('public/img/akaunting-logo-white.svg') }}">
                             </span>
-
                             <span class="nav-link-text long-texts pl-2 mwpx-100">{{ Str::limit(setting('company.name'), 22) }}</span>
                             @permission('read-common-companies')
                                 <i class="fas fa-sort-down pl-2"></i>
diff --git a/resources/views/partials/portal/menu.blade.php b/resources/views/partials/portal/menu.blade.php
index fc2fabf5b..c6f5089b3 100644
--- a/resources/views/partials/portal/menu.blade.php
+++ b/resources/views/partials/portal/menu.blade.php
@@ -1,5 +1,5 @@
 @stack('menu_start')
-    <nav class="sidenav navbar navbar-vertical fixed-left navbar-expand-sm navbar-light bg-default" id="sidenav-main">
+    <nav class="sidenav navbar navbar-vertical fixed-left navbar-expand-xs navbar-light bg-default" id="sidenav-main">
         <div class="scrollbar-inner">
             <div class="sidenav-header d-flex align-items-center ml-4">
                 <ul class="navbar-nav">
@@ -8,12 +8,10 @@
                             <span class="avatar menu-avatar background-unset">
                                 <img class="border-radius-none border-0 mr-3" alt="Image placeholder" src="{{ setting('company.logo') ? Storage::url(setting('company.logo')) : asset('public/img/akaunting-logo-white.svg') }}">
                             </span>
-
                             <span class="nav-link-text long-texts pl-2 mwpx-100">{{ Str::limit(setting('company.name'), 22) }}</span>
                         </a>
                     </li>
                 </ul>
-
                 <div class="ml-auto left-menu-toggle-position">
                     <div class="sidenav-toggler d-none d-xl-block left-menu-toggle" data-action="sidenav-unpin" data-target="#sidenav-main">
                         <div class="sidenav-toggler-inner">
@@ -24,7 +22,6 @@
                     </div>
                 </div>
             </div>
-
             {!! menu('portal') !!}
         </div>
     </nav>
diff --git a/resources/views/partials/reports/table/rows.blade.php b/resources/views/partials/reports/table/rows.blade.php
index 30fdbb3e4..51832cc90 100644
--- a/resources/views/partials/reports/table/rows.blade.php
+++ b/resources/views/partials/reports/table/rows.blade.php
@@ -1,6 +1,6 @@
 @php $row_total = 0; @endphp
 <tr class="row rp-border-top-1 font-size-unset">
-    <td class="{{ $class->column_name_width }}">{{ $class->row_names[$table][$id] }}</td>
+    <td class="{{ $class->column_name_width }} long-texts pr-0">{{ $class->row_names[$table][$id] }}</td>
     @foreach($rows as $row)
         @php $row_total += $row; @endphp
         <td class="{{ $class->column_value_width }} text-right px-0">@money($row, setting('default.currency'), true)</td>
diff --git a/resources/views/partials/wizard/content.blade.php b/resources/views/partials/wizard/content.blade.php
index 9fdc71051..fc161692b 100644
--- a/resources/views/partials/wizard/content.blade.php
+++ b/resources/views/partials/wizard/content.blade.php
@@ -13,6 +13,6 @@
         @yield('content')
 
     @stack('content_content_end')
-
     <notifications></notifications>
+    <component v-bind:is="component"></component>
 @stack('content_end')
diff --git a/resources/views/portal/invoices/show.blade.php b/resources/views/portal/invoices/show.blade.php
index bd620749f..26dd3aea7 100644
--- a/resources/views/portal/invoices/show.blade.php
+++ b/resources/views/portal/invoices/show.blade.php
@@ -236,7 +236,7 @@
                             <div class="table-responsive">
                                 <table class="table">
                                     <tbody>
-                                        @foreach ($invoice->totals as $total)
+                                        @foreach ($invoice->totals_sorted as $total)
                                             @if ($total->code != 'total')
                                                 @stack($total->code . '_td_start')
                                                     <tr>
diff --git a/resources/views/portal/invoices/signed.blade.php b/resources/views/portal/invoices/signed.blade.php
index 7d6055b76..f2807f987 100644
--- a/resources/views/portal/invoices/signed.blade.php
+++ b/resources/views/portal/invoices/signed.blade.php
@@ -184,7 +184,7 @@
                     <div class="table-responsive">
                         <table class="table">
                             <tbody>
-                                @foreach($invoice->totals as $total)
+                                @foreach($invoice->totals_sorted as $total)
                                     @if($total->code != 'total')
                                         <tr>
                                             <th>{{ trans($total['name']) }}:</th>
diff --git a/resources/views/purchases/bills/create.blade.php b/resources/views/purchases/bills/create.blade.php
index 3840b6274..ac968c294 100644
--- a/resources/views/purchases/bills/create.blade.php
+++ b/resources/views/purchases/bills/create.blade.php
@@ -127,7 +127,7 @@
                                                                                     <i class="fa fa-percent"></i>
                                                                                 </span>
                                                                             </div>
-                                                                            {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
+                                                                            {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control', 'v-model' => 'form.discount']) !!}
                                                                         </div>
                                                                     </div>
                                                                     <div class="col-sm-6">
diff --git a/resources/views/purchases/bills/edit.blade.php b/resources/views/purchases/bills/edit.blade.php
index 8be122eb6..1a8371fc7 100644
--- a/resources/views/purchases/bills/edit.blade.php
+++ b/resources/views/purchases/bills/edit.blade.php
@@ -128,7 +128,7 @@
                                                                                     <i class="fa fa-percent"></i>
                                                                                 </span>
                                                                             </div>
-                                                                            {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
+                                                                            {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control', 'v-model' => 'form.discount']) !!}
                                                                         </div>
                                                                     </div>
                                                                     <div class="col-sm-6">
diff --git a/resources/views/purchases/bills/print.blade.php b/resources/views/purchases/bills/print.blade.php
index bc16f7865..330e0f86b 100644
--- a/resources/views/purchases/bills/print.blade.php
+++ b/resources/views/purchases/bills/print.blade.php
@@ -173,7 +173,7 @@
 
         <div class="col-42">
             <div class="text company pr-2">
-                @foreach ($bill->totals as $total)
+                @foreach ($bill->totals_sorted as $total)
                         @if ($total->code != 'total')
                             @stack($total->code . '_td_start')
                                 <div class="border-top-1 py-2">
diff --git a/resources/views/purchases/bills/show.blade.php b/resources/views/purchases/bills/show.blade.php
index 128ff8131..9f55c1f44 100644
--- a/resources/views/purchases/bills/show.blade.php
+++ b/resources/views/purchases/bills/show.blade.php
@@ -412,7 +412,7 @@
                             <div class="table-responsive">
                                 <table class="table">
                                     <tbody>
-                                        @foreach ($bill->totals as $total)
+                                        @foreach ($bill->totals_sorted as $total)
                                             @if ($total->code != 'total')
                                                 @stack($total->code . '_td_start')
                                                     <tr>
@@ -472,7 +472,7 @@
 
                             @stack('button_group_start')
                                 <div class="dropup header-drop-top">
-                                    <button type="button" class="btn btn-primary header-button-top" data-toggle="dropdown" aria-expanded="false">{{ trans('general.more_actions') }}</button>
+                                    <button type="button" class="btn btn-primary header-button-top" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-chevron-up"></i>&nbsp; {{ trans('general.more_actions') }}</button>
 
                                     <div class="dropdown-menu" role="menu">
                                         @if ($bill->status != 'cancelled')
diff --git a/resources/views/sales/invoices/create.blade.php b/resources/views/sales/invoices/create.blade.php
index 5d3212b6e..cfb1b9972 100644
--- a/resources/views/sales/invoices/create.blade.php
+++ b/resources/views/sales/invoices/create.blade.php
@@ -127,7 +127,7 @@
                                                                                     <i class="fa fa-percent"></i>
                                                                                 </span>
                                                                             </div>
-                                                                            {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
+                                                                            {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control', 'v-model' => 'form.discount']) !!}
                                                                         </div>
                                                                     </div>
                                                                     <div class="col-sm-6">
diff --git a/resources/views/sales/invoices/edit.blade.php b/resources/views/sales/invoices/edit.blade.php
index 793a6dd33..a767627b6 100644
--- a/resources/views/sales/invoices/edit.blade.php
+++ b/resources/views/sales/invoices/edit.blade.php
@@ -28,7 +28,7 @@
 
                     {{ Form::textGroup('invoice_number', trans('invoices.invoice_number'), 'file') }}
 
-                    {{ Form::textGroup('order_number', trans('invoices.order_number'), 'shopping-cart',[]) }}
+                    {{ 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
@@ -128,7 +128,7 @@
                                                                                     <i class="fa fa-percent"></i>
                                                                                 </span>
                                                                             </div>
-                                                                            {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
+                                                                            {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control', 'v-model' => 'form.discount']) !!}
                                                                         </div>
                                                                     </div>
                                                                     <div class="col-sm-6">
diff --git a/resources/views/sales/invoices/print_classic.blade.php b/resources/views/sales/invoices/print_classic.blade.php
index ee2f0018f..83cca35a7 100644
--- a/resources/views/sales/invoices/print_classic.blade.php
+++ b/resources/views/sales/invoices/print_classic.blade.php
@@ -111,7 +111,7 @@
                     <span class="float-right">@date($invoice->due_at)</span><br><br>
                 @stack('due_at_input_end')
 
-                @foreach ($invoice->totals as $total)
+                @foreach ($invoice->totals_sorted as $total)
                     @if ($total->code == 'total')
                         <strong>{{ trans($total->name) }}:</strong>
                         <span class="float-right">@money($total->amount - $invoice->paid, $invoice->currency_code, true)</span><br><br>
@@ -189,7 +189,7 @@
 
         <div class="col-42 float-right text-right">
             <div class="text company pr-2">
-                @foreach ($invoice->totals as $total)
+                @foreach ($invoice->totals_sorted as $total)
                     @if ($total->code != 'total')
                         @stack($total->code . '_td_start')
                             <div class="border-top-dashed py-2">
diff --git a/resources/views/sales/invoices/print_default.blade.php b/resources/views/sales/invoices/print_default.blade.php
index 0797f1218..0fcf537eb 100644
--- a/resources/views/sales/invoices/print_default.blade.php
+++ b/resources/views/sales/invoices/print_default.blade.php
@@ -177,7 +177,7 @@
 
         <div class="col-42 float-right text-right">
             <div class="text company">
-                @foreach ($invoice->totals as $total)
+                @foreach ($invoice->totals_sorted as $total)
                     @if ($total->code != 'total')
                         @stack($total->code . '_td_start')
                             <div class="border-top-1 py-2">
diff --git a/resources/views/sales/invoices/print_modern.blade.php b/resources/views/sales/invoices/print_modern.blade.php
index 4c58bae8e..dade8bec3 100644
--- a/resources/views/sales/invoices/print_modern.blade.php
+++ b/resources/views/sales/invoices/print_modern.blade.php
@@ -158,7 +158,7 @@
 
         <div class="col-42 float-right text-right">
             <div class="text company pr-2">
-                @foreach ($invoice->totals as $total)
+                @foreach ($invoice->totals_sorted as $total)
                     @if ($total->code != 'total')
                         @stack($total->code . '_td_start')
                             <strong class="float-left">{{ trans($total->title) }}:</strong>
diff --git a/resources/views/sales/invoices/show.blade.php b/resources/views/sales/invoices/show.blade.php
index 4bb5278b8..f5d54bde6 100644
--- a/resources/views/sales/invoices/show.blade.php
+++ b/resources/views/sales/invoices/show.blade.php
@@ -427,7 +427,7 @@
                             <div class="table-responsive">
                                 <table class="table">
                                     <tbody>
-                                        @foreach ($invoice->totals as $total)
+                                        @foreach ($invoice->totals_sorted as $total)
                                             @if ($total->code != 'total')
                                                 @stack($total->code . '_td_start')
                                                     <tr>
@@ -495,7 +495,7 @@
 
                             @stack('button_group_start')
                                 <div class="dropup header-drop-top">
-                                    <button type="button" class="btn btn-primary header-button-top" data-toggle="dropdown" aria-expanded="false">{{ trans('general.more_actions') }}</button>
+                                    <button type="button" class="btn btn-primary header-button-top" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-chevron-up"></i>&nbsp; {{ trans('general.more_actions') }}</button>
                                     <div class="dropdown-menu" role="menu">
                                         @if ($invoice->status != 'cancelled')
                                             @stack('button_pay_start')