Merge branch 'dev' into 7103-testVnSearchbar

src/components/common/VnInputDate.vue

@@ -105,6 +105,7 @@ const manageDate = (date) => {
             :rules="mixinRules"
             :clearable="false"
             @click="isPopupOpen = !isPopupOpen"
+            @keydown="isPopupOpen = false"
             hide-bottom-space
         >
             <template #append>

src/components/common/VnInputTime.vue

@@ -79,6 +79,7 @@ function dateToTime(newDate) {
             style="min-width: 100px"
             :rules="mixinRules"
             @click="isPopupOpen = !isPopupOpen"
+            @keydown="isPopupOpen = false"
             type="time"
             hide-bottom-space
         >

src/components/common/VnSelect.vue

@@ -294,7 +294,7 @@ async function onScroll({ to, direction, from, index }) {
     }
 }
 
-defineExpose({ opts: myOptions });
+defineExpose({ opts: myOptions, vnSelectRef });
 
 function handleKeyDown(event) {
     if (event.key === 'Tab' && !event.shiftKey) {

src/components/common/VnSelectDialog.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { computed } from 'vue';
+import { ref, computed } from 'vue';
 import { useRole } from 'src/composables/useRole';
 import { useAcl } from 'src/composables/useAcl';
 
@@ -7,6 +7,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 const emit = defineEmits(['update:modelValue']);
 
 const value = defineModel({ type: [String, Number, Object] });
+const select = ref(null);
 const $props = defineProps({
     rolesAllowedToCreate: {
         type: Array,
@@ -33,10 +34,13 @@ const isAllowedToCreate = computed(() => {
     if ($props.acls.length) return acl.hasAny($props.acls);
     return role.hasAny($props.rolesAllowedToCreate);
 });
+
+defineExpose({ vnSelectDialogRef: select });
 </script>
 
 <template>
     <VnSelect
+        ref="select"
         v-model="value"
         v-bind="$attrs"
         @update:model-value="(...args) => emit('update:modelValue', ...args)"

src/composables/useArrayData.js

@@ -7,7 +7,9 @@ import { isDialogOpened } from 'src/filters';
 
 const arrayDataStore = useArrayDataStore();
 
-export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
+export function useArrayData(key, userOptions) {
+    key ??= useRoute().meta.moduleName;
+    
     if (!key) throw new Error('ArrayData: A key is required to use this composable');
 
     if (!arrayDataStore.get(key)) arrayDataStore.set(key);

src/css/app.scss

@@ -310,6 +310,14 @@ input::-webkit-inner-spin-button {
 .no-visible {
     visibility: hidden;
 }
+
+.q-item > .q-item__section:has(.q-checkbox) {
+    max-width: min-content;
+}
+
+.row > .column:has(.q-checkbox) {
+    max-width: min-content;
+}
 .q-field__inner {
     .q-field__control {
         min-height: auto !important;

src/filters/index.js

@@ -16,6 +16,7 @@ import getUpdatedValues from './getUpdatedValues';
 import getParamWhere from './getParamWhere';
 import parsePhone from './parsePhone';
 import isDialogOpened from './isDialogOpened';
+import toCelsius from './toCelsius';
 
 export {
     getUpdatedValues,
@@ -36,4 +37,5 @@ export {
     dashIfEmpty,
     dateRange,
     getParamWhere,
+    toCelsius,
 };

src/filters/toCelsius.js

@@ -0,0 +1,3 @@
+export default function toCelsius(value) {
+    return value ? `${value}°C` : '';
+}

src/i18n/locale/en.yml

@@ -704,6 +704,7 @@ travel:
             totalEntries: Total entries
             totalEntriesTooltip: Total entries
             daysOnward: Landed days onwards
+            awb: AWB
     summary:
         entryId: Entry Id
         freight: Freight

src/i18n/locale/es.yml

@@ -700,6 +700,7 @@ travel:
             totalEntries: ∑
             totalEntriesTooltip: Entradas totales
             daysOnward: Días de llegada en adelante
+            awb: AWB
     summary:
         entryId: Id entrada
         freight: Porte

src/pages/Customer/Card/CustomerBillingData.vue

@@ -38,7 +38,7 @@ const getBankEntities = (data, formData) => {
                     hide-selected
                     option-label="name"
                     option-value="id"
-                    v-model="data.payMethod"
+                    v-model="data.payMethodFk"
                 />
                 <VnInput :label="t('Due day')" clearable v-model="data.dueDay" />
             </VnRow>

src/pages/Customer/Card/CustomerCredits.vue

@@ -59,6 +59,7 @@ const columns = computed(() => [
 </script>
 <template>
     <VnTable
+        :user-filter="{ include: filter.include }"
         ref="tableRef"
         data-key="ClientCredit"
         url="ClientCredits"

src/pages/Customer/Card/CustomerGreuges.vue

@@ -84,6 +84,7 @@ const columns = computed(() => [
             component: 'number',
             autofocus: true,
             required: true,
+            positive: false,
         },
         format: ({ amount }) => toCurrency(amount),
         create: true,

src/pages/Customer/CustomerList.vue

@@ -431,7 +431,7 @@ function handleLocation(data, location) {
                 :label="t('customer.summary.salesPerson')"
                 v-model="data.salesPersonFk"
                 :params="{
-                    departmentCodes: ['VT', 'shopping'],
+                    departmentCodes: ['VT'],
                 }"
                 :has-avatar="true"
                 :id-value="data.salesPersonFk"

src/pages/Entry/Card/EntryBasicData.vue

@@ -3,7 +3,6 @@ import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useRole } from 'src/composables/useRole';
-
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
@@ -11,7 +10,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import FilterTravelForm from 'src/components/FilterTravelForm.vue';
-
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import { toDate } from 'src/filters';
 
 const route = useRoute();
@@ -26,6 +25,7 @@ const onFilterTravelSelected = (formData, id) => {
     formData.travelFk = id;
 };
 </script>
+
 <template>
     <FetchData
         ref="companiesRef"
@@ -93,14 +93,13 @@ const onFilterTravelSelected = (formData, id) => {
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
                             <QItemSection>
-                                <QItemLabel
-                                    >{{ scope.opt?.agencyModeName }} -
-                                    {{ scope.opt?.warehouseInName }} ({{
-                                        toDate(scope.opt?.shipped)
-                                    }}) &#x2192; {{ scope.opt?.warehouseOutName }} ({{
-                                        toDate(scope.opt?.landed)
-                                    }})</QItemLabel
-                                >
+                                <QItemLabel>
+                                    {{ scope.opt?.agencyModeName }} -
+                                    {{ scope.opt?.warehouseInName }}
+                                    ({{ toDate(scope.opt?.shipped) }}) →
+                                    {{ scope.opt?.warehouseOutName }}
+                                    ({{ toDate(scope.opt?.landed) }})
+                                </QItemLabel>
                             </QItemSection>
                         </QItem>
                     </template>
@@ -126,6 +125,13 @@ const onFilterTravelSelected = (formData, id) => {
                 />
             </VnRow>
             <VnRow>
+                <VnInputNumber
+                    :label="t('entry.summary.commission')"
+                    v-model="data.commission"
+                    step="1"
+                    autofocus
+                    :positive="false"
+                />
                 <VnSelect
                     :label="t('entry.summary.currency')"
                     v-model="data.currencyFk"
@@ -133,12 +139,23 @@ const onFilterTravelSelected = (formData, id) => {
                     option-value="id"
                     option-label="code"
                 />
-                <QInput
-                    :label="t('entry.summary.commission')"
-                    v-model="data.commission"
-                    type="number"
-                    autofocus
-                    min="0"
+            </VnRow>
+            <VnRow>
+                <VnInputNumber
+                    v-model="data.initialTemperature"
+                    name="initialTemperature"
+                    :label="t('entry.basicData.initialTemperature')"
+                    :step="0.5"
+                    :decimal-places="2"
+                    :positive="false"
+                />
+                <VnInputNumber
+                    v-model="data.finalTemperature"
+                    name="finalTemperature"
+                    :label="t('entry.basicData.finalTemperature')"
+                    :step="0.5"
+                    :decimal-places="2"
+                    :positive="false"
                 />
             </VnRow>
             <VnRow>

src/pages/Entry/Card/EntrySummary.vue

@@ -7,7 +7,7 @@ import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
 
-import { toDate, toCurrency } from 'src/filters';
+import { toDate, toCurrency, toCelsius } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
 import FetchedTags from 'src/components/ui/FetchedTags.vue';
@@ -193,6 +193,14 @@ const fetchEntryBuys = async () => {
                     :label="t('entry.summary.invoiceNumber')"
                     :value="entry.invoiceNumber"
                 />
+                <VnLv
+                    :label="t('entry.basicData.initialTemperature')"
+                    :value="toCelsius(entry.initialTemperature)"
+                />
+                <VnLv
+                    :label="t('entry.basicData.finalTemperature')"
+                    :value="toCelsius(entry.finalTemperature)"
+                />
             </QCard>
             <QCard class="vn-one">
                 <VnTitle

src/pages/Entry/EntryList.vue

@@ -3,7 +3,7 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import EntryFilter from './EntryFilter.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
-import { toDate } from 'src/filters';
+import { toCelsius, toDate } from 'src/filters';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import EntrySummary from './Card/EntrySummary.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
@@ -157,6 +157,20 @@ const columns = computed(() => [
         name: 'invoiceAmount',
         cardVisible: true,
     },
+    {
+        align: 'left',
+        name: 'initialTemperature',
+        label: t('entry.basicData.initialTemperature'),
+        field: 'initialTemperature',
+        format: (row) => toCelsius(row.initialTemperature),
+    },
+    {
+        align: 'left',
+        name: 'finalTemperature',
+        label: t('entry.basicData.finalTemperature'),
+        field: 'finalTemperature',
+        format: (row) => toCelsius(row.finalTemperature),
+    },
     {
         label: t('entry.list.tableVisibleColumns.isExcludedFromAvailable'),
         name: 'isExcludedFromAvailable',
@@ -188,7 +202,7 @@ const columns = computed(() => [
         :array-data-props="{
             url: 'Entries/filter',
             order: 'id DESC',
-            userFilter: 'entryFilter',
+            userFilter: entryFilter,
         }"
     >
         <template #rightMenu>

src/pages/Entry/locale/en.yml

@@ -40,6 +40,8 @@ entry:
         observation: Observation
         booked: Booked
         excludedFromAvailable: Inventory
+        initialTemperature: Ini °C
+        finalTemperature: Fin °C
     buys:
         observations: Observations
         packagingFk: Box

src/pages/Entry/locale/es.yml

@@ -41,6 +41,8 @@ entry:
         commission: Comisión
         booked: Asentado
         excludedFromAvailable: Inventario
+        initialTemperature: Ini °C
+        finalTemperature: Fin °C
     buys:
         observations: Observaciónes
         packagingFk: Embalaje

src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue

@@ -6,24 +6,16 @@ import axios from 'axios';
 import { toCurrency, toDate } from 'src/filters';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
-import FetchData from 'src/components/FetchData.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import { useCapitalize } from 'src/composables/useCapitalize';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import InvoiceInDescriptorMenu from './InvoiceInDescriptorMenu.vue';
 
 const $props = defineProps({ id: { type: Number, default: null } });
-const { push, currentRoute } = useRouter();
+const { currentRoute } = useRouter();
 const { t } = useI18n();
 
 const cardDescriptorRef = ref();
-const correctionDialogRef = ref();
 const entityId = computed(() => $props.id || +currentRoute.value.params.id);
 const totalAmount = ref();
-const config = ref();
-const cplusRectificationTypes = ref([]);
-const siiTypeInvoiceIns = ref([]);
-const invoiceCorrectionTypes = ref([]);
 
 const filter = {
     include: [
@@ -85,12 +77,6 @@ const routes = reactive({
         return { name: 'EntryCard', params: { id } };
     },
 });
-const correctionFormData = reactive({
-    invoiceReason: 2,
-    invoiceType: 2,
-    invoiceClass: 6,
-});
-const isNotFilled = computed(() => Object.values(correctionFormData).includes(null));
 
 onBeforeMount(async () => {
     await setInvoiceCorrection(entityId.value);
@@ -122,38 +108,8 @@ async function setInvoiceCorrection(id) {
         (corrected) => corrected.correctingFk
     );
 }
-
-const createInvoiceInCorrection = async () => {
-    const { data: correctingId } = await axios.post(
-        'InvoiceIns/corrective',
-        Object.assign(correctionFormData, { id: entityId.value })
-    );
-    push({ path: `/invoice-in/${correctingId}/summary` });
-};
 </script>
 <template>
-    <FetchData
-        url="InvoiceInConfigs"
-        :where="{ fields: ['sageWithholdingFk'] }"
-        auto-load
-        @on-fetch="(data) => (config = data)"
-    />
-    <FetchData
-        url="CplusRectificationTypes"
-        @on-fetch="(data) => (cplusRectificationTypes = data)"
-        auto-load
-    />
-    <FetchData
-        url="SiiTypeInvoiceIns"
-        :where="{ code: { like: 'R%' } }"
-        @on-fetch="(data) => (siiTypeInvoiceIns = data)"
-        auto-load
-    />
-    <FetchData
-        url="InvoiceCorrectionTypes"
-        @on-fetch="(data) => (invoiceCorrectionTypes = data)"
-        auto-load
-    />
     <CardDescriptor
         ref="cardDescriptorRef"
         module="InvoiceIn"
@@ -167,7 +123,10 @@ const createInvoiceInCorrection = async () => {
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('invoicein.list.issued')" :value="toDate(entity.issued)" />
-            <VnLv :label="t('invoicein.summary.bookedDate')" :value="toDate(entity.booked)" />
+            <VnLv
+                :label="t('invoicein.summary.bookedDate')"
+                :value="toDate(entity.booked)"
+            />
             <VnLv :label="t('invoicein.list.amount')" :value="toCurrency(totalAmount)" />
             <VnLv :label="t('invoicein.list.supplier')">
                 <template #value>
@@ -227,65 +186,6 @@ const createInvoiceInCorrection = async () => {
             </QCardActions>
         </template>
     </CardDescriptor>
-    <QDialog ref="correctionDialogRef">
-        <QCard>
-            <QCardSection>
-                <QItem class="q-px-none">
-                    <span class="text-primary text-h6 full-width">
-                        {{ t('Create rectificative invoice') }}
-                    </span>
-                    <QBtn icon="close" flat round dense v-close-popup />
-                </QItem>
-            </QCardSection>
-            <QCardSection>
-                <QItem>
-                    <QItemSection>
-                        <QInput
-                            :label="t('Original invoice')"
-                            v-model="entityId"
-                            readonly
-                        />
-                        <VnSelect
-                            :label="`${useCapitalize(t('globals.class'))}`"
-                            v-model="correctionFormData.invoiceClass"
-                            :options="siiTypeInvoiceIns"
-                            option-value="id"
-                            option-label="code"
-                            :required="true"
-                        />
-                    </QItemSection>
-                    <QItemSection>
-                        <VnSelect
-                            :label="`${useCapitalize(t('globals.type'))}`"
-                            v-model="correctionFormData.invoiceType"
-                            :options="cplusRectificationTypes"
-                            option-value="id"
-                            option-label="description"
-                            :required="true"
-                        />
-                        <VnSelect
-                            :label="`${useCapitalize(t('globals.reason'))}`"
-                            v-model="correctionFormData.invoiceReason"
-                            :options="invoiceCorrectionTypes"
-                            option-value="id"
-                            option-label="description"
-                            :required="true"
-                        />
-                    </QItemSection>
-                </QItem>
-            </QCardSection>
-            <QCardActions class="justify-end q-mr-sm">
-                <QBtn flat :label="t('globals.close')" color="primary" v-close-popup />
-                <QBtn
-                    :label="t('globals.save')"
-                    color="primary"
-                    v-close-popup
-                    @click="createInvoiceInCorrection"
-                    :disable="isNotFilled"
-                />
-            </QCardActions>
-        </QCard>
-    </QDialog>
 </template>
 <style lang="scss" scoped>
 .q-dialog {

src/pages/InvoiceIn/Card/InvoiceInDescriptorMenu.vue

@@ -8,9 +8,12 @@ import { useAcl } from 'src/composables/useAcl';
 import { downloadFile } from 'src/composables/downloadFile';
 import { useArrayData } from 'src/composables/useArrayData';
 import { usePrintService } from 'composables/usePrintService';
+import { useCapitalize } from 'src/composables/useCapitalize';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import InvoiceInToBook from '../InvoiceInToBook.vue';
+import FetchData from 'src/components/FetchData.vue';
 
 const { hasAny } = useAcl();
 const { t } = useI18n();
@@ -31,6 +34,10 @@ const correctionDialogRef = ref();
 const invoiceInCorrection = reactive({ correcting: [], corrected: null });
 const entityId = computed(() => $props.invoice.id || +currentRoute.value.params.id);
 const invoiceIn = computed(() => arrayData.store.data);
+const isNotFilled = computed(() => Object.values(correctionFormData).includes(null));
+const invoiceCorrectionTypes = ref([]);
+const cplusRectificationTypes = ref([]);
+const siiTypeInvoiceIns = ref([]);
 const actions = {
     unbook: {
         title: t('assertAction', { action: t('invoicein.descriptorMenu.unbook') }),
@@ -48,6 +55,11 @@ const actions = {
     sendPdf: { cb: sendPdfInvoiceConfirmation },
     correct: { cb: () => correctionDialogRef.value.show() },
 };
+const correctionFormData = reactive({
+    invoiceReason: 2,
+    invoiceType: 2,
+    invoiceClass: 8,
+});
 const canEditProp = (props) =>
     hasAny([{ model: 'InvoiceIn', props, accessType: 'WRITE' }]);
 
@@ -133,9 +145,39 @@ function sendPdfInvoice({ address }) {
             recipient: address,
         });
 }
+
+const createInvoiceInCorrection = async () => {
+    const { data: correctingId } = await axios.post(
+        'InvoiceIns/corrective',
+        Object.assign(correctionFormData, { id: entityId.value })
+    );
+    push({ path: `/invoice-in/${correctingId}/summary` });
+};
 </script>
 
 <template>
+    <FetchData
+        url="InvoiceCorrectionTypes"
+        @on-fetch="(data) => (invoiceCorrectionTypes = data)"
+        auto-load
+    />
+    <FetchData
+        url="CplusRectificationTypes"
+        @on-fetch="(data) => (cplusRectificationTypes = data)"
+        auto-load
+    />
+    <FetchData
+        url="SiiTypeInvoiceIns"
+        :where="{ code: { like: 'R%' } }"
+        @on-fetch="(data) => (siiTypeInvoiceIns = data)"
+        auto-load
+    />
+    <FetchData
+        url="InvoiceInConfigs"
+        :where="{ fields: ['sageWithholdingFk'] }"
+        auto-load
+        @on-fetch="(data) => (config = data)"
+    />
     <InvoiceInToBook>
         <template #content="{ book }">
             <QItem
@@ -162,7 +204,7 @@ function sendPdfInvoice({ address }) {
         v-if="canEditProp('deleteById')"
         v-ripple
         clickable
-        @click="triggerMenu('invoicein.descriptorMenu.delete')"
+        @click="triggerMenu('delete')"
     >
         <QItemSection>{{ t('invoicein.descriptorMenu.deleteInvoice') }}</QItemSection>
     </QItem>
@@ -192,6 +234,79 @@ function sendPdfInvoice({ address }) {
     <QItem v-if="invoice.dmsFk" v-ripple clickable @click="downloadFile(invoice.dmsFk)">
         <QItemSection>{{ t('components.smartCard.downloadFile') }}</QItemSection>
     </QItem>
+    <QDialog ref="correctionDialogRef">
+        <QCard>
+            <QCardSection>
+                <QItem class="q-px-none">
+                    <span class="text-primary text-h6 full-width">
+                        {{ t('Create rectificative invoice') }}
+                    </span>
+                    <QBtn icon="close" flat round dense v-close-popup />
+                </QItem>
+            </QCardSection>
+            <QCardSection>
+                <QItem>
+                    <QItemSection>
+                        <QInput
+                            :label="t('Original invoice')"
+                            v-model="entityId"
+                            readonly
+                        />
+                        <VnSelect
+                            :label="`${useCapitalize(t('globals.class'))}`"
+                            v-model="correctionFormData.invoiceClass"
+                            :options="siiTypeInvoiceIns"
+                            option-value="id"
+                            option-label="code"
+                            :required="true"
+                        />
+                    </QItemSection>
+                    <QItemSection>
+                        <VnSelect
+                            :label="`${useCapitalize(t('globals.type'))}`"
+                            v-model="correctionFormData.invoiceType"
+                            :options="cplusRectificationTypes"
+                            option-value="id"
+                            option-label="description"
+                            :required="true"
+                        >
+                            <template #option="{ itemProps, opt }">
+                                <QItem v-bind="itemProps">
+                                    {{ console.log('opt: ', opt) }}
+                                    <QItemSection>
+                                        <QItemLabel
+                                            >{{ opt.id }} -
+                                            {{ opt.description }}</QItemLabel
+                                        >
+                                    </QItemSection>
+                                </QItem>
+                                <div></div>
+                            </template>
+                        </VnSelect>
+
+                        <VnSelect
+                            :label="`${useCapitalize(t('globals.reason'))}`"
+                            v-model="correctionFormData.invoiceReason"
+                            :options="invoiceCorrectionTypes"
+                            option-value="id"
+                            option-label="description"
+                            :required="true"
+                        />
+                    </QItemSection>
+                </QItem>
+            </QCardSection>
+            <QCardActions class="justify-end q-mr-sm">
+                <QBtn flat :label="t('globals.close')" color="primary" v-close-popup />
+                <QBtn
+                    :label="t('globals.save')"
+                    color="primary"
+                    v-close-popup
+                    @click="createInvoiceInCorrection"
+                    :disable="isNotFilled"
+                />
+            </QCardActions>
+        </QCard>
+    </QDialog>
 </template>
 
 <i18n>

src/pages/InvoiceIn/Card/InvoiceInVat.vue

@@ -25,6 +25,7 @@ const sageTaxTypes = ref([]);
 const sageTransactionTypes = ref([]);
 const rowsSelected = ref([]);
 const invoiceInFormRef = ref();
+const expenseRef = ref();
 
 defineProps({
     actionIcon: {
@@ -128,7 +129,7 @@ function autocompleteExpense(evt, row, col) {
         ({ id }) => id == useAccountShortToStandard(param)
     );
 
-    if (lookup) row[col.model] = lookup;
+    expenseRef.value.vnSelectDialogRef.vnSelectRef.toggleOption(lookup);
 }
 </script>
 <template>
@@ -167,6 +168,7 @@ function autocompleteExpense(evt, row, col) {
                 <template #body-cell-expense="{ row, col }">
                     <QTd>
                         <VnSelectDialog
+                            ref="expenseRef"
                             v-model="row[col.model]"
                             :options="col.options"
                             :option-value="col.optionValue"

src/pages/Supplier/Card/SupplierFiscalData.vue

@@ -68,6 +68,8 @@ function handleLocation(data, location) {
                 'supplierActivityFk',
                 'healthRegister',
                 'street',
+                'isVies',
+                'isTrucker',
             ],
             include: [
                 {

src/pages/Ticket/Card/TicketSale.vue

@@ -54,7 +54,6 @@ const transfer = ref({
 });
 const tableRef = ref([]);
 const canProceed = ref();
-const isLoading = ref(false);
 
 watch(
     () => route.params.id,
@@ -197,6 +196,7 @@ const changeQuantity = async (sale) => {
     try {
         if (!rowToUpdate.value) return;
         rowToUpdate.value = null;
+        sale.isNew = false;
         await updateQuantity(sale);
     } catch (e) {
         const { quantity } = tableRef.value.CrudModelRef.originalData.find(
@@ -214,9 +214,6 @@ const updateQuantity = async ({ quantity, id }) => {
 };
 
 const addSale = async (sale) => {
-    if (isLoading.value) return;
-
-    isLoading.value = true;
     const params = {
         barcode: sale.itemFk,
         quantity: sale.quantity,
@@ -237,6 +234,7 @@ const addSale = async (sale) => {
     sale.item = newSale.item;
 
     notify('globals.dataSaved', 'positive');
+    sale.isNew = false;
     arrayData.fetch({});
 };
 
@@ -754,6 +752,7 @@ watch(
                 option-label="name"
                 option-value="id"
                 v-model="row.itemFk"
+                :use-like="false"
                 @update:model-value="updateItem(row)"
             >
                 <template #option="scope">

src/pages/Ticket/Card/TicketService.vue

@@ -166,8 +166,10 @@ async function handleSave() {
                             v-model="row.ticketServiceTypeFk"
                             :options="ticketServiceOptions"
                             option-label="name"
+                            :roles-allowed-to-create="['administrative']"
                             option-value="id"
                             hide-selected
+                            sort-by="name ASC"
                         >
                             <template #form>
                                 <TicketCreateServiceType

src/pages/Travel/Card/TravelSummary.vue

@@ -9,7 +9,7 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import { toDate, toCurrency } from 'src/filters';
+import { toDate, toCurrency, toCelsius } from 'src/filters';
 import axios from 'axios';
 import TravelDescriptorMenuItems from './TravelDescriptorMenuItems.vue';
 
@@ -97,6 +97,20 @@ const entriesTableColumns = computed(() => {
             showValue: true,
         },
         { label: 'm³', field: 'm3', name: 'm3', align: 'left', showValue: true },
+        {
+            label: t('entry.basicData.initialTemperature'),
+            field: 'initialTemperature',
+            name: 'initialTemperature',
+            align: 'left',
+            format: (val) => toCelsius(val),
+        },
+        {
+            label: t('entry.basicData.finalTemperature'),
+            field: 'finalTemperature',
+            name: 'finalTemperature',
+            align: 'left',
+            format: (val) => toCelsius(val),
+        },
         {
             label: '',
             field: 'observation',
@@ -127,14 +141,14 @@ const thermographsTableColumns = computed(() => {
             field: 'maxTemperature',
             name: 'maxTemperature',
             align: 'left',
-            format: (val) => (val ? `${val}°` : ''),
+            format: (val) => toCelsius(val),
         },
         {
             label: t('globals.minTemperature'),
             field: 'minTemperature',
             name: 'minTemperature',
             align: 'left',
-            format: (val) => (val ? `${val}°` : ''),
+            format: (val) => toCelsius(val),
         },
         {
             label: t('globals.state'),

src/pages/Travel/Card/TravelThermographs.vue

@@ -10,7 +10,7 @@ import FetchData from 'src/components/FetchData.vue';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
-import { toDate } from 'src/filters';
+import { toDate, toCelsius } from 'src/filters';
 import { downloadFile } from 'src/composables/downloadFile';
 
 const route = useRoute();
@@ -52,14 +52,14 @@ const TableColumns = computed(() => {
             field: 'maxTemperature',
             name: 'maxTemperature',
             align: 'left',
-            format: (val) => (val ? `${val}°` : ''),
+            format: (val) => toCelsius(val),
         },
         {
             label: t('globals.minTemperature'),
             field: 'minTemperature',
             name: 'minTemperature',
             align: 'left',
-            format: (val) => (val ? `${val}°` : ''),
+            format: (val) => toCelsius(val),
         },
         {
             label: t('globals.state'),

src/pages/Travel/TravelList.vue

@@ -79,6 +79,13 @@ const columns = computed(() => [
         cardVisible: true,
         create: true,
     },
+    {
+        align: 'left',
+        name: 'awb',
+        label: t('travel.travelList.tableVisibleColumns.awb'),
+        columnFilter: false,
+        format: (row) => row.awbCode,
+    },
     {
         align: 'left',
         name: 'warehouseInFk',

src/pages/Worker/Card/WorkerPda.vue

@@ -27,7 +27,7 @@ const initialData = computed(() => {
     return {
         userFk: routeId.value,
         deviceProductionFk: null,
-        simSerialNumber: null,
+        simFk: null,
     };
 });
 
@@ -42,7 +42,7 @@ const deallocatePDA = async (deviceProductionFk) => {
 
 function reloadData() {
     initialData.value.deviceProductionFk = null;
-    initialData.value.simSerialNumber = null;
+    initialData.value.simFk = null;
     paginate.value.fetch();
 }
 </script>
@@ -89,7 +89,7 @@ function reloadData() {
                         />
                         <VnInput
                             :label="t('Current SIM')"
-                            :model-value="row?.simSerialNumber"
+                            :model-value="row?.simFk"
                             disable
                         />
                         <QBtn
@@ -150,7 +150,7 @@ function reloadData() {
                                     </template>
                                 </VnSelect>
                                 <VnInput
-                                    v-model="data.simSerialNumber"
+                                    v-model="data.simFk"
                                     :label="t('SIM serial number')"
                                     id="simSerialNumber"
                                     use-input

src/pages/Worker/Card/WorkerTimeControl.vue

@@ -283,21 +283,22 @@ const fetchWeekData = async () => {
         year: selectedDateYear.value,
         week: selectedWeekNumber.value,
     };
-    const mail = (
-        await axiosNoError.get(`Workers/${route.params.id}/mail`, {
-            params: { filter: { where } },
-        })
-    ).data[0];
+    try {
+        const [{ data: mailData }, { data: countData }] = await Promise.all([
+            axiosNoError.get(`Workers/${route.params.id}/mail`, {
+                params: { filter: { where } },
+            }),
+            axiosNoError.get('WorkerTimeControlMails/count', { params: { where } }),
+        ]);
 
-    if (!mail) state.value = null;
-    else {
-        state.value = mail.state;
-        reason.value = mail.reason;
+        const mail = mailData[0];
+
+        state.value = mail?.state;
+        reason.value = mail?.reason;
+        canResend.value = !!countData.count;
+    } catch {
+        state.value = null;
     }
-
-    canResend.value = !!(
-        await axiosNoError.get('WorkerTimeControlMails/count', { params: { where } })
-    ).data.count;
 };
 
 const setHours = (data) => {

test/cypress/integration/claim/claimPhoto.spec.js

@@ -1,5 +1,6 @@
 /// <reference types="cypress" />
-describe('ClaimPhoto', () => {
+// redmine.verdnatura.es/issues/8417
+describe.skip('ClaimPhoto', () => {
     beforeEach(() => {
         const claimId = 1;
         cy.login('developer');

test/cypress/integration/entry/myEntry.spec.js

@@ -8,8 +8,8 @@ describe('EntryMy when is supplier', () => {
             },
         });
     });
-
-    it('should open buyLabel when is supplier', () => {
+    // https://redmine.verdnatura.es/issues/8418
+    it.skip('should open buyLabel when is supplier', () => {
         cy.get(
             '[to="/null/3"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
         ).click();

test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js

@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
-
-describe('InvoiceInCorrective', () => {
+// https://redmine.verdnatura.es/issues/8419
+describe.skip('InvoiceInCorrective', () => {
     const createCorrective = '.q-menu > .q-list > :nth-child(6) > .q-item__section';
     const rectificativeSection = '.q-drawer-container .q-list > a:nth-child(6)';
     const saveDialog = '.q-card > .q-card__actions > .q-btn--standard ';

test/cypress/integration/invoiceIn/invoiceInList.spec.js

@@ -21,8 +21,8 @@ describe('InvoiceInList', () => {
                 cy.url().should('include', `/invoice-in/${id}/summary`);
             });
     });
-
-    it('should open the details', () => {
+    // https://redmine.verdnatura.es/issues/8420
+    it.skip('should open the details', () => {
         cy.get(firstDetailBtn).click();
         cy.get(summaryHeaders).eq(1).contains('Basic data');
         cy.get(summaryHeaders).eq(4).contains('Vat');

test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js

@@ -35,8 +35,8 @@ describe('InvoiceOut summary', () => {
         cy.dataCy('VnConfirm_confirm').click();
         cy.checkNotification('InvoiceOut deleted');
     });
-
-    it('should transfer the invoice ', () => {
+    // https://redmine.verdnatura.es/issues/8415
+    it.skip('should transfer the invoice ', () => {
         cy.typeSearchbar('T1111111{enter}');
         cy.dataCy('descriptor-more-opts').click();
         cy.get('.q-menu > .q-list > :nth-child(1)').click();

test/cypress/integration/item/itemList.spec.js

@@ -15,8 +15,8 @@ describe('Item list', () => {
         cy.get('.q-menu .q-item').contains('Anthurium').click();
         cy.get('.q-virtual-scroll__content > :nth-child(4) > :nth-child(4)').click();
     });
-
-    it('should create an item', () => {
+    // https://redmine.verdnatura.es/issues/8421
+    it.skip('should create an item', () => {
         const data = {
             Description: { val: `Test item` },
             Type: { val: `Crisantemo`, type: 'select' },

test/cypress/integration/item/itemTag.spec.js

@@ -18,8 +18,8 @@ describe('Item tag', () => {
         +cy.dataCy('crudModelDefaultSaveBtn').click();
         cy.checkNotification("The tag or priority can't be repeated for an item");
     });
-
-    it('should add a new tag', () => {
+    // https://redmine.verdnatura.es/issues/8422
+    it.skip('should add a new tag', () => {
         cy.get('.q-page').should('be.visible');
         cy.get('.q-page-sticky > div').click();
         cy.get('.q-page-sticky > div').click();

test/cypress/integration/ticket/ticketExpedition.spec.js

@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
-
-describe('Ticket expedtion', () => {
+// https://redmine.verdnatura.es/issues/8423
+describe.skip('Ticket expedtion', () => {
     const tableContent = '.q-table .q-virtual-scroll__content';
     const stateTd = 'td:nth-child(9)';
 

test/cypress/integration/ticket/ticketList.spec.js

@@ -30,8 +30,8 @@ describe('TicketList', () => {
         cy.get(firstRow).find('.q-btn:first').click();
         cy.get('@windowOpen').should('be.calledWithMatch', /\/ticket\/\d+\/sale/);
     });
-
-    it('should open ticket summary', () => {
+    // https://redmine.verdnatura.es/issues/8424
+    it.skip('should open ticket summary', () => {
         searchResults();
         cy.get(firstRow).find('.q-btn:last').click();
         cy.dataCy('ticketSummary').should('exist');

test/cypress/integration/vnComponent/VnLocation.spec.js

@@ -53,7 +53,8 @@ describe('VnLocation', () => {
             cy.waitForElement('.q-card');
             cy.get(inputLocation).click();
         });
-        it('Show all options', function () {
+        // https://redmine.verdnatura.es/issues/8436
+        it.skip('Show all options', function () {
             cy.get(locationOptions).should('have.length.at.least', 5);
         });
         it('input filter location as "al"', function () {

test/cypress/integration/zone/zoneWarehouse.spec.js

@@ -18,8 +18,8 @@ describe('ZoneWarehouse', () => {
         cy.get(saveBtn).click();
         cy.checkNotification(dataError);
     });
-
-    it('should create & remove a warehouse', () => {
+    // https://redmine.verdnatura.es/issues/8425
+    it.skip('should create & remove a warehouse', () => {
         cy.addBtnClick();
         cy.fillInForm(data);
         cy.get(saveBtn).click();