Merge pull request 'fix: update default DMS code and improve filter handling in various components' (!1637) from someHotFixes into master
gitea/salix-front/pipeline/head This commit looks good Details

Reviewed-on: #1637
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
Pablo Natek 2025-03-25 13:32:41 +00:00
commit 77f0e7b492
6 changed files with 13 additions and 8 deletions

View File

@ -15,7 +15,7 @@ const editDownloadDisabled = ref(false);
const $props = defineProps({
defaultDmsCode: {
type: String,
default: 'InvoiceIn',
default: 'invoiceIn',
},
disable: {
type: Boolean,

View File

@ -648,7 +648,7 @@ onMounted(() => {
:url="`Entries/${entityId}/getBuyList`"
search-url="EntryBuys"
save-url="Buys/crud"
:filter="filter"
:filter="editableMode ? filter : {}"
:disable-option="{ card: true }"
v-model:selected="selectedRows"
@on-fetch="() => footerFetchDataRef.fetch()"

View File

@ -147,7 +147,7 @@ async function deleteEntry() {
<template>
<CardDescriptor
:url="`Entries/${entityId}`"
:user-filter="entryFilter"
:filter="entryFilter"
title="supplier.nickname"
data-key="Entry"
width="lg-width"

View File

@ -116,6 +116,7 @@ const filter = computed(() => ({
hour: 0,
minute: 0,
second: 0,
milliseconds: 0,
}),
m3: { neq: null },
},

View File

@ -199,7 +199,11 @@ const entriesTotals = computed(() => {
entriesTableRows.value.forEach((row) => {
for (const key in totals) {
totals[key] += row[key] || 0;
if (key === 'cc') {
totals[key] += Math.ceil(row[key] || 0);
} else {
totals[key] += row[key] || 0;
}
}
});
@ -337,9 +341,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
<VnLv :label="t('globals.totalEntries')" :value="travel.totalEntries" />
<VnLv
:label="t('travel.summary.availabled')"
:value="
dashIfEmpty(toDateTimeFormat(travel.availabled))
"
:value="dashIfEmpty(toDateTimeFormat(travel.availabled))"
/>
</QCard>
<QCard class="full-width">

View File

@ -89,7 +89,7 @@ defineExpose({ states });
/>
<VnSelect
:label="t('travel.warehouseOut')"
v-model="params.warehouseOut"
v-model="params.warehouseOutFk"
@update:model-value="searchFn()"
url="warehouses"
:use-like="false"
@ -140,6 +140,7 @@ en:
ref: Reference
agency: Agency
warehouseInFk: Warehouse In
warehouseOutFk: Warehouse Out
shipped: Shipped
shipmentHour: Shipment Hour
warehouseOut: Warehouse Out
@ -153,6 +154,7 @@ es:
ref: Referencia
agency: Agencia
warehouseInFk: Alm.Entrada
warehouseOutFk: Alm.Salida
shipped: F.Envío
shipmentHour: Hora de envío
warehouseOut: Alm.Salida