diff --git a/resources/views/partials/form/checkbox_group.blade.php b/resources/views/partials/form/checkbox_group.blade.php
index f1af46eeb..6f57c5cd7 100644
--- a/resources/views/partials/form/checkbox_group.blade.php
+++ b/resources/views/partials/form/checkbox_group.blade.php
@@ -12,7 +12,7 @@
                     {{ Form::checkbox($name, $item->$id, null, [
                         'id' => 'checkbox-' . $name . '-' . $item->$id,
                         'class' => 'custom-control-input',
-                        'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : !empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name
+                        'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name),
                     ]) }}
 
                     <label class="custom-control-label" for="checkbox-{{ $name . '-' . $item->$id}}">
diff --git a/resources/views/partials/form/date_group.blade.php b/resources/views/partials/form/date_group.blade.php
index 1cf7e04b7..10ea8c265 100644
--- a/resources/views/partials/form/date_group.blade.php
+++ b/resources/views/partials/form/date_group.blade.php
@@ -18,7 +18,7 @@
         @endif
      }"
     :icon="'fa fa-{{ $icon }}'"
-    @interface="{{ !empty($attributes['v-model']) ? $attributes['v-model'] . ' = $event' :  !empty($attributes['data-field'])  ? 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' : 'form.' . $name . ' = $event' }}"
+    @interface="{{ !empty($attributes['v-model']) ? $attributes['v-model'] . ' = $event' :  (!empty($attributes['data-field'])  ? 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' : 'form.' . $name . ' = $event') }}"
     :form-error="{{ isset($attributes['v-error-message']) ? $attributes['v-error-message'] : 'form.errors.get("' . $name . '")' }}"
 ></akaunting-date>
 
diff --git a/resources/views/partials/form/email_group.blade.php b/resources/views/partials/form/email_group.blade.php
index 8d12c7775..fdf76f36b 100644
--- a/resources/views/partials/form/email_group.blade.php
+++ b/resources/views/partials/form/email_group.blade.php
@@ -18,7 +18,7 @@
             'data-name' => $name,
             'data-value' => $value,
             'placeholder' => trans('general.form.enter', ['field' => $text]),
-            'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : !empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name
+            'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name),
         ], $attributes)) !!}
     </div>
 
diff --git a/resources/views/partials/form/invoice_text.blade.php b/resources/views/partials/form/invoice_text.blade.php
index 6563026b4..2946dd252 100644
--- a/resources/views/partials/form/invoice_text.blade.php
+++ b/resources/views/partials/form/invoice_text.blade.php
@@ -17,7 +17,7 @@
             'data-name' => $input_name,
             'data-value' => $input_value,
             'placeholder' => trans('general.form.enter', ['field' => $text]),
-            'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : !empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name
+            'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name),
         ]) !!}
     </div>
 
diff --git a/resources/views/partials/form/money_group.blade.php b/resources/views/partials/form/money_group.blade.php
index a7a5a6159..e273bf342 100644
--- a/resources/views/partials/form/money_group.blade.php
+++ b/resources/views/partials/form/money_group.blade.php
@@ -22,8 +22,8 @@
             'class' => 'form-control',
             'data-name' => $name,
             'data-value' => $value,
-            'v-model.lazy' => !empty($attributes['v-model']) ? $attributes['v-model'] : !empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name,
-            'v-money' => 'money'
+            'v-model.lazy' => !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name),
+            'v-money' => 'money',
         ], $attributes)) !!}
     </div>
 
diff --git a/resources/views/partials/form/multi_select_add_new_group.blade.php b/resources/views/partials/form/multi_select_add_new_group.blade.php
index 43a56bd9d..dc7929fc4 100644
--- a/resources/views/partials/form/multi_select_add_new_group.blade.php
+++ b/resources/views/partials/form/multi_select_add_new_group.blade.php
@@ -32,7 +32,7 @@
     @if (!empty($attributes['collapse']))
     :collapse="true"
     @endif
-    @interface="{{ !empty($attributes['v-model']) ? $attributes['v-model'] . ' = $event' :  !empty($attributes['data-field'])  ? 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' : 'form.' . $name . ' = $event' }}"
+    @interface="{{ !empty($attributes['v-model']) ? $attributes['v-model'] . ' = $event' : (!empty($attributes['data-field'])  ? 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' : 'form.' . $name . ' = $event') }}"
     @if (!empty($attributes['change']))
     @change="{{ $attributes['change'] }}($event)"
     @endif
diff --git a/resources/views/partials/form/multi_select_group.blade.php b/resources/views/partials/form/multi_select_group.blade.php
index 7a33bb942..340e192b1 100644
--- a/resources/views/partials/form/multi_select_group.blade.php
+++ b/resources/views/partials/form/multi_select_group.blade.php
@@ -13,7 +13,7 @@
     @if (!empty($attributes['collapse']))
     :collapse="true"
     @endif
-    @interface="{{ !empty($attributes['v-model']) ? $attributes['v-model'] . ' = $event' :  !empty($attributes['data-field'])  ? 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' : 'form.' . $name . ' = $event' }}"
+    @interface="{{ !empty($attributes['v-model']) ? $attributes['v-model'] . ' = $event' : (!empty($attributes['data-field'])  ? 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' : 'form.' . $name . ' = $event') }}"
     @if (!empty($attributes['change']))
     @change="{{ $attributes['change'] }}($event)"
     @endif
diff --git a/resources/views/partials/form/number_group.blade.php b/resources/views/partials/form/number_group.blade.php
index a5a5c1b06..519aa3c98 100644
--- a/resources/views/partials/form/number_group.blade.php
+++ b/resources/views/partials/form/number_group.blade.php
@@ -16,7 +16,7 @@
             'data-name' => $name,
             'data-value' => $value,
             'placeholder' => trans('general.form.enter', ['field' => $text]),
-            'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : !empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name
+            'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name),
         ], $attributes)) !!}
     </div>
 
diff --git a/resources/views/partials/form/password_group.blade.php b/resources/views/partials/form/password_group.blade.php
index 390096c84..c60de1701 100644
--- a/resources/views/partials/form/password_group.blade.php
+++ b/resources/views/partials/form/password_group.blade.php
@@ -17,7 +17,7 @@
             'class' => 'form-control',
             'data-name' => $name,
             'placeholder' => trans('general.form.enter', ['field' => $text]),
-            'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : !empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name
+            'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name),
         ], $attributes)) !!}
     </div>
 
diff --git a/resources/views/partials/form/radio_group.blade.php b/resources/views/partials/form/radio_group.blade.php
index 772264540..bfa6aac96 100644
--- a/resources/views/partials/form/radio_group.blade.php
+++ b/resources/views/partials/form/radio_group.blade.php
@@ -8,12 +8,12 @@
         <div class="btn-group btn-group-toggle radio-yes-no" data-toggle="buttons">
             <label class="btn btn-success" @click="form.{{ $name }}=1" v-bind:class="{ active: form.{{ $name }} == 1 }">
                 {{ trans('general.yes') }}
-            <input type="radio" name="{{ $name }}" id="{{ $name }}-1" v-model="{{ !empty($attributes['v-model']) ? $attributes['v-model'] : !empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name }}">
+            <input type="radio" name="{{ $name }}" id="{{ $name }}-1" v-model="{{ !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name) }}">
             </label>
 
             <label class="btn btn-danger" @click="form.{{ $name }}=0" v-bind:class="{ active: form.{{ $name }} == 0 }">
                 {{ trans('general.no') }}
-                <input type="radio" name="{{ $name }}" id="{{ $name }}-0" v-model="{{ !empty($attributes['v-model']) ? $attributes['v-model'] : !empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name }}">
+                <input type="radio" name="{{ $name }}" id="{{ $name }}-0" v-model="{{ !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name) }}">
             </label>
         </div>
         <input type="hidden" name="{{ $name }}" value="{{ ($value) ? true : false }}" />
diff --git a/resources/views/partials/form/select_add_new_group.blade.php b/resources/views/partials/form/select_add_new_group.blade.php
index 7b713bde8..02a480eb2 100644
--- a/resources/views/partials/form/select_add_new_group.blade.php
+++ b/resources/views/partials/form/select_add_new_group.blade.php
@@ -27,7 +27,7 @@
                 ]
             ]
         ])}}"
-        @interface="{{ !empty($attributes['v-model']) ? $attributes['v-model'] . ' = $event' :  !empty($attributes['data-field'])  ? 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' : 'form.' . $name . ' = $event' }}"
+        @interface="{{ !empty($attributes['v-model']) ? $attributes['v-model'] . ' = $event' : (!empty($attributes['data-field'])  ? 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' : 'form.' . $name . ' = $event') }}"
         @if (!empty($attributes['change']))
         @change="{{ $attributes['change'] }}($event)"
         @endif
diff --git a/resources/views/partials/form/select_group.blade.php b/resources/views/partials/form/select_group.blade.php
index b3229b18e..5d29ba994 100644
--- a/resources/views/partials/form/select_group.blade.php
+++ b/resources/views/partials/form/select_group.blade.php
@@ -9,7 +9,7 @@
     :options="{{ json_encode($values) }}"
     :value="'{{ old($name, $selected) }}'"
     :icon="'{{ $icon }}'"
-    @interface="{{ !empty($attributes['v-model']) ? $attributes['v-model'] . ' = $event' :  !empty($attributes['data-field'])  ? 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' : 'form.' . $name . ' = $event' }}"
+    @interface="{{ !empty($attributes['v-model']) ? $attributes['v-model'] . ' = $event' : (!empty($attributes['data-field'])  ? 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' : 'form.' . $name . ' = $event') }}"
     @if (!empty($attributes['change']))
     @change="{{ $attributes['change'] }}($event)"
     @endif
diff --git a/resources/views/partials/form/select_group_add_new_group.blade.php b/resources/views/partials/form/select_group_add_new_group.blade.php
index c945303af..d575b7f3f 100644
--- a/resources/views/partials/form/select_group_add_new_group.blade.php
+++ b/resources/views/partials/form/select_group_add_new_group.blade.php
@@ -29,7 +29,7 @@
         ]
     ])}}"
     :group="true"
-    @interface="{{ !empty($attributes['v-model']) ? $attributes['v-model'] . ' = $event' :  !empty($attributes['data-field'])  ? 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' : 'form.' . $name . ' = $event' }}"
+    @interface="{{ !empty($attributes['v-model']) ? $attributes['v-model'] . ' = $event' : (!empty($attributes['data-field'])  ? 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' : 'form.' . $name . ' = $event') }}"
     @if (!empty($attributes['change']))
     @change="{{ $attributes['change'] }}($event)"
     @endif
diff --git a/resources/views/partials/form/select_group_group.blade.php b/resources/views/partials/form/select_group_group.blade.php
index c3aca3eef..172eb7979 100644
--- a/resources/views/partials/form/select_group_group.blade.php
+++ b/resources/views/partials/form/select_group_group.blade.php
@@ -10,7 +10,7 @@
     :value="'{{ old($name, $selected) }}'"
     :icon="'{{ $icon }}'"
     :group="true"
-    @interface="{{ !empty($attributes['v-model']) ? $attributes['v-model'] . ' = $event' :  !empty($attributes['data-field'])  ? 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' : 'form.' . $name . ' = $event' }}"
+    @interface="{{ !empty($attributes['v-model']) ? $attributes['v-model'] . ' = $event' : (!empty($attributes['data-field'])  ? 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' : 'form.' . $name . ' = $event') }}"
     @if (!empty($attributes['change']))
     @change="{{ $attributes['change'] }}($event)"
     @endif
diff --git a/resources/views/partials/form/text_group.blade.php b/resources/views/partials/form/text_group.blade.php
index 07a60d706..f6ddc25e6 100644
--- a/resources/views/partials/form/text_group.blade.php
+++ b/resources/views/partials/form/text_group.blade.php
@@ -16,7 +16,7 @@
             'data-name' => $name,
             'data-value' => $value,
             'placeholder' => trans('general.form.enter', ['field' => $text]),
-            'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : !empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name
+            'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name),
         ], $attributes)) !!}
     </div>
 
diff --git a/resources/views/partials/form/textarea_group.blade.php b/resources/views/partials/form/textarea_group.blade.php
index b85c13cdb..005c4e9d2 100644
--- a/resources/views/partials/form/textarea_group.blade.php
+++ b/resources/views/partials/form/textarea_group.blade.php
@@ -10,7 +10,7 @@
         'data-name' => $name,
         'data-value' => $value,
         'placeholder' => trans('general.form.enter', ['field' => $text]),
-        'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : !empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name
+        'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name),
     ], $attributes)) !!}
 
     <div class="invalid-feedback d-block"