From 784fca7e0b6049264874eff699b064bcbe5fa176 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 28 Apr 2025 14:19:43 +0200
Subject: [PATCH 1/3] fix: i18n ticketBasicDataForm

---
 src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue | 4 ++--
 src/pages/Ticket/locale/en.yml                          | 1 +
 src/pages/Ticket/locale/es.yml                          | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index d83d0f2b7..18af48283 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -290,7 +290,7 @@ async function getZone(options) {
                 </template>
             </VnSelect>
             <VnSelect
-                :label="t('ticketList.warehouse')"
+                :label="t('basicData.warehouse')"
                 v-model="warehouseId"
                 option-value="id"
                 option-label="name"
@@ -298,7 +298,7 @@ async function getZone(options) {
                 hide-selected
                 map-options
                 :required="true"
-                :rules="validate('ticketList.warehouse')"
+                :rules="validate('basicData.warehouse')"
             />
         </VnRow>
         <VnRow class="row q-gutter-md q-mb-md no-wrap">
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 175f0955b..2c9ea95f6 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -120,6 +120,7 @@ basicData:
     difference: Difference
     total: Total
     price: Price
+    warehouse: Warehouse
     newPrice: New price
     chargeDifference: Charge difference to
     withoutNegatives: Create without negatives
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 3d03a7b33..6bd307d07 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -47,6 +47,7 @@ basicData:
     difference: Diferencia
     total: Total
     price: Precio
+    warehouse: Almacén
     newPrice: Nuevo precio
     chargeDifference: Cargar diferencia a
     withoutNegatives: Crear sin negativos

From e134cbf36dc60180544fd908bd1c0a3d8c772d7f Mon Sep 17 00:00:00 2001
From: jon <jon@verdnatura.es>
Date: Tue, 29 Apr 2025 09:53:24 +0200
Subject: [PATCH 2/3] fix: modified download btn to show the file instead to
 downloading it directly

---
 src/pages/Customer/Card/CustomerFileManagement.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerFileManagement.vue b/src/pages/Customer/Card/CustomerFileManagement.vue
index 419719251..4107ca37a 100644
--- a/src/pages/Customer/Card/CustomerFileManagement.vue
+++ b/src/pages/Customer/Card/CustomerFileManagement.vue
@@ -5,7 +5,6 @@ import { useRoute, useRouter } from 'vue-router';
 
 import { QBadge, QBtn, QCheckbox } from 'quasar';
 
-import { downloadFile } from 'src/composables/downloadFile';
 import { toDateTimeFormat } from 'src/filters/date';
 
 import FetchData from 'components/FetchData.vue';
@@ -87,7 +86,7 @@ const tableColumnComponents = {
     file: {
         component: QBtn,
         props: () => ({ flat: true }),
-        event: ({ row }) => downloadFile(row.dmsFk),
+        event: ({ row }) => openReport(`dms/${row.dmsFk}/downloadFile`, {}, '_blank'),
     },
     employee: {
         component: QBtn,

From 19ae5a9b3d528f5c5a188c39fd83295056ef056d Mon Sep 17 00:00:00 2001
From: jon <jon@verdnatura.es>
Date: Tue, 29 Apr 2025 10:40:49 +0200
Subject: [PATCH 3/3] fix: customer file downlaod file same behavior as
 VnDmsList

---
 src/pages/Customer/Card/CustomerFileManagement.vue          | 3 ++-
 .../Customer/components/CustomerFileManagementActions.vue   | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerFileManagement.vue b/src/pages/Customer/Card/CustomerFileManagement.vue
index 4107ca37a..419719251 100644
--- a/src/pages/Customer/Card/CustomerFileManagement.vue
+++ b/src/pages/Customer/Card/CustomerFileManagement.vue
@@ -5,6 +5,7 @@ import { useRoute, useRouter } from 'vue-router';
 
 import { QBadge, QBtn, QCheckbox } from 'quasar';
 
+import { downloadFile } from 'src/composables/downloadFile';
 import { toDateTimeFormat } from 'src/filters/date';
 
 import FetchData from 'components/FetchData.vue';
@@ -86,7 +87,7 @@ const tableColumnComponents = {
     file: {
         component: QBtn,
         props: () => ({ flat: true }),
-        event: ({ row }) => openReport(`dms/${row.dmsFk}/downloadFile`, {}, '_blank'),
+        event: ({ row }) => downloadFile(row.dmsFk),
     },
     employee: {
         component: QBtn,
diff --git a/src/pages/Customer/components/CustomerFileManagementActions.vue b/src/pages/Customer/components/CustomerFileManagementActions.vue
index 683f062ff..1fcafdccd 100644
--- a/src/pages/Customer/components/CustomerFileManagementActions.vue
+++ b/src/pages/Customer/components/CustomerFileManagementActions.vue
@@ -1,9 +1,9 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
-
 import { useQuasar } from 'quasar';
 
+import { usePrintService } from 'composables/usePrintService';
 import { downloadFile } from 'src/composables/downloadFile';
 
 import CustomerFileManagementDelete from 'src/pages/Customer/components/CustomerFileManagementDelete.vue';
@@ -12,7 +12,7 @@ const { t } = useI18n();
 const quasar = useQuasar();
 const route = useRoute();
 const router = useRouter();
-
+const { openReport } = usePrintService();
 const $props = defineProps({
     id: {
         type: Number,
@@ -24,7 +24,7 @@ const $props = defineProps({
     },
 });
 
-const setDownloadFile = () => downloadFile($props.id);
+const setDownloadFile = () => openReport(`dms/${$props.id}/downloadFile`, {}, '_blank');
 
 const toCustomerFileManagementEdit = () => {
     router.push({