Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test

src/pages/InvoiceOut/InvoiceOutList.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, onUnmounted, ref, computed } from 'vue';
+import { onMounted, onUnmounted, ref, computed, watchEffect } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
@@ -12,7 +12,6 @@ import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
 import { toCurrency, toDate } from 'src/filters/index';
 import { useStateStore } from 'stores/useStateStore';
 import { QBtn } from 'quasar';
-import { watchEffect } from 'vue';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 
 const { t } = useI18n();
@@ -222,6 +221,7 @@ watchEffect(selectedRows);
             </span>
         </template>
         <template #more-create-dialog="{ data }">
+            <div class="flex no-wrap flex-center">
                 <VnSelect
                     url="Tickets"
                     v-model="data.ticketFk"
@@ -230,6 +230,8 @@ watchEffect(selectedRows);
                     option-label="nickname"
                     option-value="id"
                 />
+                <span class="q-ml-md">O</span>
+            </div>
             <VnSelect
                 url="Clients"
                 v-model="data.clientFk"
@@ -238,10 +240,6 @@ watchEffect(selectedRows);
                 option-label="name"
                 option-value="id"
             />
-            <VnInputDate
-                :label="t('invoiceOutList.tableVisibleColumns.dueDate')"
-                v-model="data.maxShipped"
-            />
             <VnSelect
                 url="InvoiceOutSerials"
                 v-model="data.invoiceOutSerial"
@@ -250,6 +248,10 @@ watchEffect(selectedRows);
                 option-label="description"
                 option-value="code"
             />
+            <VnInputDate
+                :label="t('invoiceOutList.tableVisibleColumns.dueDate')"
+                v-model="data.maxShipped"
+            />
             <VnSelect
                 url="TaxAreas"
                 v-model="data.area"

src/pages/InvoiceOut/InvoiceOutNegativeBases.vue

@@ -74,6 +74,9 @@ const columns = computed(() => [
         align: 'left',
         name: 'amount',
         label: t('invoiceOutModule.amount'),
+        columnFilter: {
+            type: 'number',
+        },
         format: (row) => toCurrency(row.amount),
         cardVisible: true,
     },