Merge branch 'master' into test

src/pages/Entry/EntryBuysTableDialog.vue

@@ -20,11 +20,17 @@ const $props = defineProps({
 const entityId = computed(() => $props.id || route.params.id);
 
 const entriesTableColumns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        field: 'id',
+        label: t('globals.id'),
+    },
     {
         align: 'left',
         name: 'itemFk',
         field: 'itemFk',
-        label: t('globals.id'),
+        label: t('entry.latestBuys.tableVisibleColumns.itemFk'),
     },
     {
         align: 'left',
@@ -76,11 +82,11 @@ const entriesTableColumns = computed(() => [
             </QCardSection>
             <QCardActions align="right">
                 <QBtn
-                    :label="t('Print buys')"
+                    :label="t('printLabels')"
                     color="primary"
                     icon="print"
                     :loading="isLoading"
-                    @click="openReport(`Entries/${entityId}/buy-label`)"
+                    @click="openReport(`Entries/${entityId}/print`)"
                     unelevated
                     autofocus
                 />
@@ -109,6 +115,19 @@ const entriesTableColumns = computed(() => [
                                     <QTd v-for="col in props.cols" :key="col.name">
                                         {{ col.value }}
                                     </QTd>
+                                    <QBtn
+                                        icon="print"
+                                        v-if="props.row.stickers > 0"
+                                        :loading="isLoading"
+                                        @click="
+                                            openReport(
+                                                `Entries/${props.row.id}/buy-label`
+                                            )
+                                        "
+                                        unelevated
+                                    >
+                                        <QTooltip>{{ t('printLabel') }}</QTooltip>
+                                    </QBtn>
                                 </QTr>
                             </template>
                         </QTable>

src/pages/Entry/MyEntries.vue

@@ -86,7 +86,7 @@ const columns = computed(() => [
         name: 'tableActions',
         actions: [
             {
-                title: t('printBuys'),
+                title: t('printLabels'),
                 icon: 'print',
                 action: (row) => printBuys(row.id),
             },

src/pages/Entry/locale/en.yml

@@ -10,4 +10,5 @@ landed: Landed
 shipped: Shipped
 fromShipped: Shipped(from)
 toShipped: Shipped(to)
-printBuys: Print buys
+printLabels: Print stickers
+printLabel: Print sticker

src/pages/Entry/locale/es.yml

@@ -14,4 +14,5 @@ landed: F. llegada
 shipped: F. salida
 fromShipped: F. salida(desde)
 toShipped: F. salida(hasta)
-Print buys: Imprimir etiquetas
+printLabels: Imprimir etiquetas
+printLabel: Imprimir etiqueta