fix: refs #6942 selectable expense

@@ -27,3 +27,3 @@
-        type: String,
+        type: [String, Number],
         default: '',
     },

@@ -154,3 +154,3 @@
-        :order-by="orderBy"
+        :sort-by="sortBy"
         :fields="fields"
     />

@@ -755,3 +756,4 @@
+            create: 'Crear',
             log: 'Historial',
         },
         list: {

@@ -429,3 +324,1 @@
-                </div>
-                <div class="col"></div>
-            </div>
+                </span>

@@ -406,4 +388,4 @@
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('invoiceIn.card.issued')" :value="toDate(entity.issued)" />
             <VnLv :label="t('invoiceIn.summary.booked')" :value="toDate(entity.booked)" />

@@ -288,3 +313,2 @@
-                        <QIcon name="open_in_new" />
-                    </a>
+                    <span class="header header-link">{{ t('Totals') }}</span>
                 </QCardSection>

@@ -300,2 +304,4 @@
                     </QTd>
                 </template>
+                <template #bottom-row>
+                    <QTr class="bg">

@@ -302,0 +315,4 @@
+                        <QTd> {{ toCurrency(getTotalRate(rows)) }}</QTd>
+                        <QTd />
+                    </QTr>
+                </template>

@@ -185,6 +187,17 @@ async function insert() {
                         />
                     </QTd>
                 </template>
+                <template #bottom-row>

@@ -1,5 +1,5 @@
 <script setup>
-import { onBeforeMount, computed, watchEffect } from 'vue';
+import { onBeforeMount, computed, watchEffect, watch } from 'vue';

@@ -319,0 +323,4 @@
+                                {{ toCurrency(entity.totals.totalDueDay) }}
+                            </QChip>
+                        </template>
+                    </VnLv>

@@ -73,6 +74,7 @@ async function insert() {
     await axios.post('/InvoiceInDueDays/new', { id: +invoiceId });
     await invoiceInFormRef.value.reload();
 }
+const getTotalAmount = (rows) => rows.reduce((acc, cur) => acc + cur.amount, 0);

@@ -184,6 +186,17 @@ async function insert() {
                         />
                     </QTd>

@@ -294,7 +307,11 @@ async function insert() {
         <QBtn color="primary" icon="add" size="lg" round @click="insert" />

@@ -60,6 +62,11 @@ const $props = defineProps({
         type: Function,
         default: null,
     },
+    goTo: {

@@ -310,7 +322,40 @@ watch(formUrl, async () => {
                 :title="t('globals.reset')"
                 v-if="$props.defaultReset"
             />
+            <QBtnDropdown

@@ -74,55 +76,17 @@ const $props = defineProps({
         type: Function,
         default: null,
     },
+    goTo: {

@@ -145,2 +109,3 @@
 }));
-const startFormWatcher = () => {
+
+onMounted(async () => {

@@ -146,1 +110,3 @@
-const startFormWatcher = () => {
+
+onMounted(async () => {
+    originalData.value = JSON.parse(JSON.stringify($props.formInitialData ?? {}));

@@ -147,0 +126,4 @@
+                if (!oldVal) return;
+                hasChanges.value =
+                    !isResetting.value &&
+                    JSON.stringify(newVal) !== JSON.stringify(originalData.value);

@@ -154,2 +141,3 @@
     );
-};
+
+watch(formUrl, async () => {

@@ -156,0 +146,4 @@
+    await fetch();
+});
+
+onBeforeRouteLeave((to, from, next) => {

@@ -182,2 +187,4 @@
     try {
         const body = $props.mapper ? $props.mapper(formData.value) : formData.value;
+        const method = $props.urlCreate ? 'post' : 'patch';
+        const url =

@@ -231,3 +237,1 @@
-    reset();
-    fetch();
-});
+function updateAndEmit(val, evt) {

@@ -273,10 +279,42 @@ defineExpose({
                     :disable="!hasChanges"
                     :title="t(defaultButtons.reset.label)"
                 />
+                <QBtnDropdown

@@ -43,3 +43,3 @@
     onBeforeRouteUpdate(async (to, from) => {
         if (to.params.id !== from.params.id) {
-            arrayData.store.url = `${props.baseUrl}/${route.params.id}`;
+            arrayData.store.url = `${props.baseUrl}/${to.params.id}`;

@@ -58,0 +57,4 @@
+    store = arrayData.store;
+    entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
+
+    if ($props.dataKey !== useRoute().meta.moduleName) await getData();

@@ -58,0 +59,4 @@
+
+    if ($props.dataKey !== useRoute().meta.moduleName) await getData();
+    watch(
+        () => [$props.url, $props.filter],

@@ -133,3 +145,3 @@
                         <div class="title">
                             <span v-if="$props.title" :title="$props.title">
-                                {{ $props.title }}
+                                {{ entity[title] ?? $props.title }}

@@ -85,2 +72,2 @@
-    );
-}
+const getTotal = (data, key) =>
+    data.reduce((acc, cur) => acc + +String(cur[key]).replace(',', '.'), 0);

@@ -123,3 +92,2 @@
             url="InvoiceInIntrastats"
-            auto-load
-            :data-required="{ invoiceInFk: route.params.id }"
+            :auto-load="!currency"

@@ -4,33 +4,17 @@ import { useI18n } from 'vue-i18n';
 
 import VnSelect from 'components/common/VnSelect.vue';

@@ -94,1 +52,4 @@
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect

@@ -19,3 +19,3 @@
         cy.visit(`/#/invoice-in/1/vat`);
 
-        cy.getValue(firstLineVat).should('equal', 'H.P. IVA 21% CEE');
+        cy.getValue(firstLineVat).should('equal', '8');

@@ -92,8 +92,13 @@ Cypress.Commands.add('checkOption', (selector) => {
 
 // Global buttons
 Cypress.Commands.add('saveCard', () => {

@@ -1,34 +0,0 @@
-import { vi, describe, expect, it, beforeAll } from 'vitest';

@@ -20,3 +20,3 @@
     describe('getTotal()', () => {
         it('should correctly handle the sum', () => {
-            vm.invoceInIntrastat = [
+            const invoceInIntrastat = [

@@ -199,6 +199,7 @@ function getLogTree(data) {
             nLogs >= 6;
 
         if (modelChanged) {
+            console.log(locale);

@@ -184,3 +184,3 @@
                 </QBtn>
                 <QBtn
-                    :href="`${url}invoice-in/create?supplierFk=${entity.id}`"
+                    :href="`#/invoice-in/create?supplierFk=${entity.id}`"

@@ -19,3 +20,2 @@
 const editDownloadDisabled = ref(false);
-const arrayData = useArrayData('InvoiceIn');
-const invoiceIn = computed(() => arrayData.store.data);
+const invoiceIn = computed(() => useArrayData('InvoiceIn').store.data);

@@ -33,3 +28,3 @@
 const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
-const arrayData = useArrayData('InvoiceIn');
+const { store } = useArrayData('InvoiceIn');

@@ -45,10 +40,9 @@ const cplusRectificationTypes = ref([]);
 const siiTypeInvoiceOuts = ref([]);
 const invoiceCorrectionTypes = ref([]);
 const actions = {

@@ -16,41 +16,6 @@ describe('InvoiceInVat', () => {
         }).vm;
     });
 
-    describe('addExpense()', () => {

@@ -24,6 +24,7 @@ vi.mock('vue-router', () => ({
                 params: {
                     id: 1,
                 },
+                meta: { moduleName: 'mockName' },