Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into develop

* 'develop' of github.com:Frappet/bma-ehr-frontend:
  salary => fix  bug

src/modules/13_salary/components/DialogInfoMain.vue

@@ -94,6 +94,17 @@ watch(
 <template>
   <q-dialog v-model="modal" position="right" :maximized="true">
     <q-card style="width: 1300px; overflow: visible">
+      <q-toolbar>
+        <q-space />
+        <q-btn
+          icon="close"
+          unelevated
+          round
+          dense
+          @click="modal = false"
+          style="color: red; background-color: #ffdede"
+        />
+      </q-toolbar>
       <q-card-section class="col q-pt-none bg-grey-12" style="height: 100%">
         <div class="q-gutter-md">
           <q-card bordered class="text-center bg-grey-12">