From 300d64b076d1f07f2e296fef690b1711039c4185 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 10 Jan 2025 10:22:37 +0100
Subject: [PATCH] feat: refs #8225 added entry module and fixed translations

---
 src/components/RegularizeStockForm.vue       |  2 +-
 src/pages/Entry/Card/EntryDescriptor.vue     | 16 ++----
 src/pages/Entry/Card/EntryDescriptorMenu.vue | 22 ++++++++
 src/pages/Entry/Card/EntrySummary.vue        |  9 +++-
 src/pages/Entry/EntryList.vue                |  1 -
 src/pages/Entry/locale/en.yml                |  1 +
 src/pages/Entry/locale/es.yml                |  1 +
 src/pages/Item/Card/ItemDescriptor.vue       |  1 -
 src/pages/Item/Card/ItemDescriptorImage.vue  |  1 -
 src/pages/Item/Card/ItemDescriptorMenu.vue   | 56 +-------------------
 src/pages/Item/ItemList.vue                  |  3 +-
 src/pages/Item/locale/en.yml                 |  1 +
 src/pages/Item/locale/es.yml                 |  1 +
 13 files changed, 41 insertions(+), 74 deletions(-)
 create mode 100644 src/pages/Entry/Card/EntryDescriptorMenu.vue

diff --git a/src/components/RegularizeStockForm.vue b/src/components/RegularizeStockForm.vue
index 3cd18d1c8..91a2e5d39 100644
--- a/src/components/RegularizeStockForm.vue
+++ b/src/components/RegularizeStockForm.vue
@@ -44,7 +44,7 @@ const onDataSaved = (data) => {
     <FormModelPopup
         url-create="Items/regularize"
         model="Items"
-        :title="t('Regularize stock')"
+        :title="t('item.regularizeStock')"
         :form-initial-data="regularizeFormData"
         @on-data-saved="onDataSaved($event)"
     >
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index 9814615a6..c54ecc3f0 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -7,9 +7,9 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 
 import { toDate } from 'src/filters';
-import { usePrintService } from 'composables/usePrintService';
 import { getUrl } from 'src/composables/getUrl';
 import filter from './EntryFilter.js';
+import EntryDescriptorMenu from './EntryDescriptorMenu.vue';
 
 const $props = defineProps({
     id: {
@@ -21,7 +21,6 @@ const $props = defineProps({
 
 const route = useRoute();
 const { t } = useI18n();
-const { openReport } = usePrintService();
 const entryDescriptorRef = ref(null);
 const url = ref();
 
@@ -52,10 +51,6 @@ const getEntryRedirectionFilter = (entry) => {
         to,
     });
 };
-
-const showEntryReport = () => {
-    openReport(`Entries/${route.params.id}/entry-order-pdf`);
-};
 </script>
 
 <template>
@@ -68,14 +63,12 @@ const showEntryReport = () => {
         data-key="Entry"
     >
         <template #menu="{ entity }">
-            <QItem v-ripple clickable @click="showEntryReport(entity)">
-                <QItemSection>{{ t('Show entry report') }}</QItemSection>
-            </QItem>
+            <EntryDescriptorMenu :id="entity.id" />
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('globals.agency')" :value="entity.travel?.agency?.name" />
-            <VnLv :label="t('globals.shipped')" :value="toDate(entity.travel?.shipped)" />
-            <VnLv :label="t('globals.landed')" :value="toDate(entity.travel?.landed)" />
+            <VnLv :label="t('shipped')" :value="toDate(entity.travel?.shipped)" />
+            <VnLv :label="t('landed')" :value="toDate(entity.travel?.landed)" />
             <VnLv
                 :label="t('globals.warehouseOut')"
                 :value="entity.travel?.warehouseOut?.name"
@@ -154,7 +147,6 @@ es:
     Supplier card: Ficha del proveedor
     All travels with current agency: Todos los envíos con la agencia actual
     All entries with current supplier: Todas las entradas con el proveedor actual
-    Show entry report: Ver informe del pedido
     Go to module index: Ir al índice del modulo
     Inventory entry: Es inventario
     Virtual entry: Es una redada
diff --git a/src/pages/Entry/Card/EntryDescriptorMenu.vue b/src/pages/Entry/Card/EntryDescriptorMenu.vue
new file mode 100644
index 000000000..a357b46fe
--- /dev/null
+++ b/src/pages/Entry/Card/EntryDescriptorMenu.vue
@@ -0,0 +1,22 @@
+<script setup>
+import { usePrintService } from 'composables/usePrintService';
+
+const { openReport } = usePrintService();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+
+function showEntryReport() {
+    openReport(`Entries/${$props.id}/entry-order-pdf`);
+}
+</script>
+
+<template>
+    <QItem v-ripple clickable @click="showEntryReport">
+        <QItemSection>{{ $t('entryList.list.showEntryReport') }}</QItemSection>
+    </QItem>
+</template>
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 39dad672c..755e39454 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -12,6 +12,7 @@ import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
 import FetchedTags from 'src/components/ui/FetchedTags.vue';
 import VnToSummary from 'src/components/ui/VnToSummary.vue';
+import EntryDescriptorMenu from './EntryDescriptorMenu.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 
@@ -172,6 +173,9 @@ const fetchEntryBuys = async () => {
         <template #header>
             <span>{{ entry.id }} - {{ entry.supplier.nickname }}</span>
         </template>
+        <template #menu="{ entity }">
+            <EntryDescriptorMenu :id="entity.id" />
+        </template>
         <template #body>
             <QCard class="vn-one">
                 <VnTitle
@@ -207,7 +211,10 @@ const fetchEntryBuys = async () => {
                     :label="t('entry.summary.travelAgency')"
                     :value="entry.travel.agency?.name"
                 />
-                <VnLv :label="t('globals.shipped')" :value="toDate(entry.travel.shipped)" />
+                <VnLv
+                    :label="t('globals.shipped')"
+                    :value="toDate(entry.travel.shipped)"
+                />
                 <VnLv
                     :label="t('globals.warehouseOut')"
                     :value="entry.travel.warehouseOut?.name"
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 7e92fe051..879a50914 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -243,7 +243,6 @@ const columns = computed(() => [
 
 <i18n>
 es:
-    Inventory entry: Es inventario
     Virtual entry: Es una redada
     Search entries: Buscar entradas
     You can search by entry reference: Puedes buscar por referencia de la entrada
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 6e41566d0..59c2666a7 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -1,6 +1,7 @@
 entryList:
     list:
         inventoryEntry: Inventory entry
+        showEntryReport: Show entry report
 entryFilter:
     filter:
         search: General search
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 7e627b09f..4fb7bbf08 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -4,6 +4,7 @@ You can search by entry reference: Puedes buscar por referencia de la entrada
 entryList:
     list:
         inventoryEntry: Es inventario
+        showEntryReport: Ver informe del pedido
 entryFilter:
     filter:
         search: Búsqueda general
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index 60ae3f364..c6fee8540 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -172,7 +172,6 @@ const updateStock = async () => {
 
 <i18n>
 es:
-    Regularize stock: Regularizar stock
     Inactive article: Artículo inactivo
 </i18n>
 
diff --git a/src/pages/Item/Card/ItemDescriptorImage.vue b/src/pages/Item/Card/ItemDescriptorImage.vue
index 05185c589..a887964e9 100644
--- a/src/pages/Item/Card/ItemDescriptorImage.vue
+++ b/src/pages/Item/Card/ItemDescriptorImage.vue
@@ -131,7 +131,6 @@ const handlePhotoUpdated = (evt = false) => {
 
 <i18n>
 es:
-    Regularize stock: Regularizar stock
     All it's properties will be copied: Todas sus propiedades serán copiadas
     Do you want to clone this item?: ¿Desea clonar este artículo?
     warehouseText: Calculado sobre el almacén de { warehouseName }
diff --git a/src/pages/Item/Card/ItemDescriptorMenu.vue b/src/pages/Item/Card/ItemDescriptorMenu.vue
index 220e63f65..3e9c6f2d4 100644
--- a/src/pages/Item/Card/ItemDescriptorMenu.vue
+++ b/src/pages/Item/Card/ItemDescriptorMenu.vue
@@ -20,7 +20,7 @@ defineEmits(['regularized']);
 <template>
     <QItem v-ripple clickable @click="$refs.regularizeStockFormDialog.show()">
         <QItemSection>
-            {{ $t('Regularize stock') }}
+            {{ $t('item.regularizeStock') }}
             <QDialog ref="regularizeStockFormDialog">
                 <RegularizeStockForm
                     :item-fk="entityId"
@@ -42,57 +42,3 @@ defineEmits(['regularized']);
     margin: 1%;
 }
 </style>
-<i18n>
-en:
-    addTurn: Add turn
-    invoiceIds: "Invoices have been generated with the following ids: {invoiceIds}"
-
-es:
-    Show Delivery Note...: Ver albarán...
-    Send Delivery Note...: Enviar albarán...
-    as PDF: como PDF
-    as PDF without prices: como PDF sin precios
-    as CSV: Como CSV
-    Send PDF: Enviar PDF
-    Send PDF to tablet: Enviar PDF a tablet
-    Send CSV: Enviar CSV
-    Show Proforma: Ver proforma
-    Delete ticket: Eliminar ticket
-    Send SMS...: Enviar SMS...
-    Pending payment: Pago pendiente
-    Minimum import: Importe mínimo
-    Notify changes: Notificar cambios
-    Ticket deleted: Ticket eliminado
-    You can undo this action within the first hour: Puedes deshacer esta acción dentro de la primera hora
-    To clone ticket: Clonar ticket
-    Ticket cloned: Ticked clonado
-    It was not able to clone the ticket: No se pudo clonar el ticket
-    Generate PDF invoice: Generar PDF factura
-    Regenerate PDF invoice: Regenerar PDF factura
-    The invoice PDF document has been regenerated: El documento PDF de la factura ha sido regenerado
-    Transfer client: Transferir cliente
-    Client: Cliente
-    addTurn: Añadir a turno
-    What is the day of receipt of the ticket?: ¿Cuál es el día de preparación del pedido?
-    Current ticket deleted and added to shift: Ticket actual eliminado y añadido al turno
-    Refund all...: Abonar todo...
-    with warehouse: con almacén
-    without warehouse: sin almacén
-    Make invoice: Crear factura
-    Change shipped hour: Cambiar hora de envío
-    Shipped hour: Hora de envío
-    Recalculate components: Recalcular componentes
-    Are you sure you want to recalculate components?: ¿Seguro que quieres recalcular los componentes?
-    Data saved: Datos guardados
-    Are you sure you want to invoice this ticket?: ¿Seguro que quieres facturar este ticket?
-    You are going to invoice this ticket: Vas a facturar este ticket
-    Ticket invoiced: Ticket facturado
-    Set weight: Establecer peso
-    Weight set: Peso establecido
-    This ticket may be invoiced, do you want to continue?: Es posible que se facture este ticket, desea continuar?
-    invoiceIds: "Se han generado las facturas con los siguientes ids: {invoiceIds}"
-    This ticket will be removed from current route! Continue anyway?: ¡Se eliminará el ticket de la ruta actual! ¿Continuar de todas formas?
-    You are going to delete this ticket: Vas a eliminar este ticket
-    as PDF signed: como PDF firmado
-    Are you sure you want to replace this delivery note?: ¿Seguro que quieres reemplazar este albarán?
-</i18n>
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index 1d6e69339..f04563791 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -152,7 +152,7 @@ const columns = computed(() => [
         },
         columnField: {
             component: null,
-        }
+        },
     },
     {
         label: t('item.list.category'),
@@ -498,5 +498,4 @@ es:
     Create Item: Crear artículo
     You can search by id: Puedes buscar por id
     Preview: Vista previa
-    Regularize stock: Regularizar stock
 </i18n>
diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml
index c4ad0f537..907c72acd 100644
--- a/src/pages/Item/locale/en.yml
+++ b/src/pages/Item/locale/en.yml
@@ -219,3 +219,4 @@ item:
         minSalesQuantity: 'Cantidad mínima de venta'
         genus: 'Genus'
         specie: 'Specie'
+    regularizeStock: Regularize stock
diff --git a/src/pages/Item/locale/es.yml b/src/pages/Item/locale/es.yml
index d558c38a6..015dea4dd 100644
--- a/src/pages/Item/locale/es.yml
+++ b/src/pages/Item/locale/es.yml
@@ -210,6 +210,7 @@ item:
         minSalesQuantity: 'Cantidad mínima de venta'
         genus: 'Genus'
         specie: 'Specie'
+    regularizeStock: Regularizar stock
     buyRequest:
         ticketId: 'ID Ticket'
         shipped: 'F. envío'