diff --git a/resources/assets/js/components/AkauntingModal.vue b/resources/assets/js/components/AkauntingModal.vue
index 7fffc8da0..9caf432a6 100644
--- a/resources/assets/js/components/AkauntingModal.vue
+++ b/resources/assets/js/components/AkauntingModal.vue
@@ -98,6 +98,14 @@ export default {
         };
     },
 
+    created: function () {
+        if (this.show) {
+            let documentClasses = document.body.classList;
+
+            documentClasses.add("modal-open");
+        }
+    },
+
     methods: {
         closeModal() {
             this.$emit("update:show", false);
@@ -111,6 +119,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..24cce235f 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/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue
index 2ecdcc4fc..c5bddc6be 100644
--- a/resources/assets/js/components/AkauntingSelect.vue
+++ b/resources/assets/js/components/AkauntingSelect.vue
@@ -814,7 +814,7 @@ export default {
                     });
                 }
 
-                this.selectOptions = sortable;
+                return sortable;
             }
         },
 
diff --git a/resources/assets/js/components/AkauntingWidget.vue b/resources/assets/js/components/AkauntingWidget.vue
index ca66e52f9..19a772d04 100644
--- a/resources/assets/js/components/AkauntingWidget.vue
+++ b/resources/assets/js/components/AkauntingWidget.vue
@@ -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/views/sales/invoices/edit.blade.php b/resources/views/sales/invoices/edit.blade.php
index 793a6dd33..915df27a7 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