From 2b012d2de4ce72f253b9d8d7e2a99f4ceb03f34f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 11 Sep 2024 10:04:40 +0200
Subject: [PATCH 1/5] fix: refs #7353 use same datakey

---
 src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue b/src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue
index 4950ab381..f1c347588 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue
@@ -3,7 +3,7 @@ import VnSearchbar from 'components/ui/VnSearchbar.vue';
 </script>
 <template>
     <VnSearchbar
-        data-key="SalesMonitorTickets"
+        data-key="saleMonitorTickets"
         url="SalesMonitors/salesFilter"
         :redirect="false"
         :label="$t('searchBar.label')"

From b559f2f18c4a0fd370ac85e3f2e7254de8c9f8b4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 11 Sep 2024 10:18:11 +0200
Subject: [PATCH 2/5] refactor: refs #7353 use global locales

---
 src/i18n/locale/en.yml                        |  9 +++++++
 src/i18n/locale/es.yml                        |  9 +++++++
 .../Monitor/Ticket/MonitorTicketFilter.vue    | 24 ++++---------------
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 362c1ec9f..02f04c994 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -278,6 +278,15 @@ globals:
     createInvoiceIn: Create invoice in
     myAccount: My account
     noOne: No one
+    params:
+        search: General search
+        clientFk: Client id
+        salesPersonFk: Sales person
+        warehouseFk: Warehouse
+        provinceFk: Province
+        from: From
+        To: To
+        stateFk: State
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 34383686c..caa6b6788 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -282,6 +282,15 @@ globals:
     createInvoiceIn: Crear factura recibida
     myAccount: Mi cuenta
     noOne: Nadie
+    params:
+        search: Búsqueda general
+        clientFk: Id cliente
+        salesPersonFk: Comercial
+        warehouseFk: Almacén
+        provinceFk: Provincia
+        from: Desde
+        To: Hasta
+        stateFk: Estado
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index 167a10465..17e26618d 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -64,7 +64,7 @@ const handleScopeDays = (params, days, callback) => {
             <QItem>
                 <QItemSection>
                     <VnInput
-                        :label="t('params.clientFk')"
+                        :label="t('globals.params.clientFk')"
                         v-model="params.clientFk"
                         is-outlined
                     />
@@ -105,7 +105,7 @@ const handleScopeDays = (params, days, callback) => {
                         outlined
                         dense
                         rounded
-                        :label="t('params.salesPersonFk')"
+                        :label="t('globals.params.salesPersonFk')"
                         v-model="params.salesPersonFk"
                         url="Workers/search"
                         :params="{ departmentCodes: ['VT'] }"
@@ -158,7 +158,7 @@ const handleScopeDays = (params, days, callback) => {
                         outlined
                         dense
                         rounded
-                        :label="t('params.stateFk')"
+                        :label="t('globals.params.stateFk')"
                         v-model="params.stateFk"
                         url="States"
                         is-outlined
@@ -184,7 +184,7 @@ const handleScopeDays = (params, days, callback) => {
                         outlined
                         dense
                         rounded
-                        :label="t('params.warehouseFk')"
+                        :label="t('globals.params.warehouseFk')"
                         v-model="params.warehouseFk"
                         :options="warehouses"
                     />
@@ -196,7 +196,7 @@ const handleScopeDays = (params, days, callback) => {
                         outlined
                         dense
                         rounded
-                        :label="t('params.provinceFk')"
+                        :label="t('globals.params.provinceFk')"
                         v-model="params.provinceFk"
                         url="Provinces"
                     />
@@ -235,22 +235,15 @@ const handleScopeDays = (params, days, callback) => {
 <i18n>
 en:
     params:
-        clientFk: Client id
         orderFk: Order id
         scopeDays: Days onward
         nickname: Nickname
-        salesPersonFk: Sales person
         refFk: Invoice
         agencyModeFk: Agency
-        stateFk: State
         groupedStates: Grouped State
-        warehouseFk: Warehouse
-        provinceFk: Province
         myTeam: My team
         problems: With problems
         pending: Pending
-        from: From
-        to: To
         alertLevel: Grouped State
     FREE: Free
     DELIVERED: Delivered
@@ -261,22 +254,15 @@ en:
     
 es:
     params:
-        clientFk: Id cliente
         orderFk: Id cesta
         scopeDays: Días en adelante
         nickname: Nombre mostrado
-        salesPersonFk: Comercial
         refFk: Factura
         agencyModeFk: Agencia
-        stateFk: Estado
         groupedStates: Estado agrupado
-        warehouseFk: Almacén
-        provinceFk: Provincia
         myTeam: Mi equipo
         problems: Con problemas
         pending: Pendiente
-        from: Desde
-        To: Hasta
         alertLevel: Estado agrupado
     FREE: Libre
     DELIVERED: Servido

From 9219fa07f57b4a317de6dd59bc9d037c744c1021 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 11 Sep 2024 11:23:14 +0200
Subject: [PATCH 3/5] fix: refs #7353 hide search param

---
 src/i18n/locale/en.yml                           | 1 -
 src/i18n/locale/es.yml                           | 1 -
 src/pages/Monitor/Ticket/MonitorTicketFilter.vue | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 02f04c994..19372f698 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -279,7 +279,6 @@ globals:
     myAccount: My account
     noOne: No one
     params:
-        search: General search
         clientFk: Client id
         salesPersonFk: Sales person
         warehouseFk: Warehouse
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index caa6b6788..60e61d51c 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -283,7 +283,6 @@ globals:
     myAccount: Mi cuenta
     noOne: Nadie
     params:
-        search: Búsqueda general
         clientFk: Id cliente
         salesPersonFk: Comercial
         warehouseFk: Almacén
diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index 17e26618d..3c95f5cdd 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -40,7 +40,7 @@ const handleScopeDays = (params, days, callback) => {
     <VnFilterPanel
         :data-key="dataKey"
         :search-button="true"
-        :hidden-tags="['from', 'to']"
+        :hidden-tags="['from', 'to', 'search']"
         :custom-tags="['scopeDays']"
         :unremovable-params="['from', 'to', 'scopeDays']"
     >

From eca34e2c0fb1eef9d4ab4e2d86d4e952d61766bd Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Fri, 13 Sep 2024 14:57:33 +0200
Subject: [PATCH 4/5] feat: refs #7644 Icon

---
 src/pages/Entry/EntryBuysTableDialog.vue | 4 ++--
 src/pages/Entry/locale/en.yml            | 2 +-
 src/pages/Entry/locale/es.yml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Entry/EntryBuysTableDialog.vue b/src/pages/Entry/EntryBuysTableDialog.vue
index 9a76770aa..0f9be6298 100644
--- a/src/pages/Entry/EntryBuysTableDialog.vue
+++ b/src/pages/Entry/EntryBuysTableDialog.vue
@@ -116,7 +116,7 @@ const entriesTableColumns = computed(() => [
                                         {{ col.value }}
                                     </QTd>
                                     <QBtn
-                                        icon="print"
+                                        icon="visibility"
                                         v-if="props.row.stickers > 0"
                                         :loading="isLoading"
                                         @click="
@@ -126,7 +126,7 @@ const entriesTableColumns = computed(() => [
                                         "
                                         unelevated
                                     >
-                                        <QTooltip>{{ t('printLabel') }}</QTooltip>
+                                        <QTooltip>{{ t('viewLabel') }}</QTooltip>
                                     </QBtn>
                                 </QTr>
                             </template>
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index f0965b097..a9faa814b 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -11,4 +11,4 @@ shipped: Shipped
 fromShipped: Shipped(from)
 toShipped: Shipped(to)
 printLabels: Print stickers
-printLabel: Print sticker
+viewLabel: View sticker
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index aba04571e..eb1e3f88a 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -15,4 +15,4 @@ shipped: F. salida
 fromShipped: F. salida(desde)
 toShipped: F. salida(hasta)
 printLabels: Imprimir etiquetas
-printLabel: Imprimir etiqueta
+viewLabel: Ver etiqueta

From 6e6af0af8085fb1e82da7f3c3c17620ba2ecf0e7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Sep 2024 15:16:40 +0200
Subject: [PATCH 5/5] perf: improve style

---
 src/pages/Item/ItemFixedPrice.vue | 110 ++++++++++++------------------
 1 file changed, 44 insertions(+), 66 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index d91b5189e..bd8c4b78c 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -76,16 +76,8 @@ const columns = computed(() => [
         name: 'rate2',
         ...defaultColumnAttrs,
         cardVisible: true,
-        columnField: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
-        columnFilter: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
+        component: 'input',
+        type: 'number',
     },
     {
         label: t('item.fixedPrice.packingPrice'),
@@ -93,35 +85,18 @@ const columns = computed(() => [
         name: 'rate3',
         ...defaultColumnAttrs,
         cardVisible: true,
-        columnField: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
-        columnFilter: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
+        component: 'input',
+        type: 'number',
     },
 
     {
         label: t('item.fixedPrice.minPrice'),
         field: 'minPrice',
-        columnClass: 'shrink',
         name: 'minPrice',
         ...defaultColumnAttrs,
         cardVisible: true,
-        columnField: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
-        columnFilter: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
+        component: 'input',
+        type: 'number',
     },
     {
         label: t('item.fixedPrice.started'),
@@ -162,16 +137,9 @@ const columns = computed(() => [
         name: 'warehouseFk',
         ...defaultColumnAttrs,
         columnClass: 'shrink',
-        columnFilter: {
-            component: 'select',
-        },
-        columnField: {
-            component: 'select',
-            class: 'expand',
-        },
-        attrs: {
-            options: warehousesOptions,
-        },
+        component: 'select',
+
+        options: warehousesOptions,
     },
     {
         align: 'right',
@@ -518,29 +486,35 @@ function handleOnDataSave({ CrudModelRef }) {
                 </span>
                 <span class="subName">{{ row.subName }}</span>
                 <ItemDescriptorProxy :id="row.itemFk" />
-                <FetchedTags style="width: max-content; max-width: 220px" :item="row" />
+                <FetchedTags :item="row" />
             </template>
             <template #column-rate2="props">
-                <VnInput
-                    mask="###.##"
-                    v-model.number="props.row.rate2"
-                    v-on="getRowUpdateInputEvents(props)"
-                >
-                    <template #append>€</template>
-                </VnInput>
+                <QTd class="col">
+                    <VnInput
+                        type="currency"
+                        style="width: 75px"
+                        v-model.number="props.row.rate2"
+                        v-on="getRowUpdateInputEvents(props)"
+                    >
+                        <template #append>€</template>
+                    </VnInput>
+                </QTd>
             </template>
             <template #column-rate3="props">
-                <VnInput
-                    mask="###.##"
-                    v-model.number="props.row.rate3"
-                    v-on="getRowUpdateInputEvents(props)"
-                >
-                    <template #append>€</template>
-                </VnInput>
+                <QTd class="col">
+                    <VnInput
+                        style="width: 75px"
+                        type="currency"
+                        v-model.number="props.row.rate3"
+                        v-on="getRowUpdateInputEvents(props)"
+                    >
+                        <template #append>€</template>
+                    </VnInput>
+                </QTd>
             </template>
             <template #column-minPrice="props">
                 <QTd class="col">
-                    <div class="row" style="width: 115px">
+                    <div class="row">
                         <QCheckbox
                             :model-value="props.row.hasMinPrice"
                             @update:model-value="updateMinPrice($event, props)"
@@ -549,6 +523,8 @@ function handleOnDataSave({ CrudModelRef }) {
                         />
                         <VnInput
                             class="col"
+                            type="currency"
+                            mask="###.##"
                             :disable="props.row.hasMinPrice === 1"
                             v-model.number="props.row.minPrice"
                             v-on="getRowUpdateInputEvents(props)"
@@ -577,15 +553,17 @@ function handleOnDataSave({ CrudModelRef }) {
                 />
             </template>
             <template #column-warehouseFk="props">
-                <VnSelect
-                    style="max-width: 150px"
-                    :options="warehousesOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    v-model="props.row.warehouseFk"
-                    v-on="getRowUpdateInputEvents(props, false, 'select')"
-                />
+                <QTd class="col">
+                    <VnSelect
+                        style="max-width: 150px"
+                        :options="warehousesOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="props.row.warehouseFk"
+                        v-on="getRowUpdateInputEvents(props, false, 'select')"
+                    />
+                </QTd>
             </template>
             <template #column-deleteAction="{ row, rowIndex }">
                 <QIcon