From d0dccddcf3c08c07a6e5e42cc54fb2a306a4e056 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 7 Jun 2024 11:37:11 +0200
Subject: [PATCH 1/4] fix: refs #7499 id article

---
 src/pages/Entry/Card/EntryBuys.vue | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index a378266aa..4d454f509 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -147,7 +147,7 @@ const entriesTableColumns = computed(() => {
     return [
         {
             label: t('entry.summary.item'),
-            field: 'id',
+            field: 'itemFk',
             name: 'item',
             align: 'left',
         },
@@ -216,7 +216,6 @@ const entriesTableColumns = computed(() => {
 });
 
 const copyOriginalRowsData = (rows) => {
-    // el objetivo de esto es guardar los valores iniciales de todas las rows para evitar guardar cambios si la data no cambió al disparar los eventos
     originalRowDataCopy.value = JSON.parse(JSON.stringify(rows));
 };
 
@@ -386,19 +385,16 @@ const lockIconType = (groupingMode, mode) => {
                                 </template>
                                 <ItemDescriptorProxy
                                     v-if="col.name === 'item'"
-                                    :id="props.row.id"
+                                    :id="props.row.item.id"
                                 />
                             </component>
                         </QTd>
                     </QTr>
-                    <QTr no-hover>
+                    <QTr no-hover class="infoRow">
                         <QTd />
                         <QTd>
                             <span>{{ props.row.item.itemType.code }}</span>
                         </QTd>
-                        <QTd>
-                            <span>{{ props.row.item.id }}</span>
-                        </QTd>
                         <QTd>
                             <span>{{ props.row.item.size }}</span>
                         </QTd>
@@ -413,10 +409,6 @@ const lockIconType = (groupingMode, mode) => {
                             <FetchedTags :item="props.row.item" :max-length="5" />
                         </QTd>
                     </QTr>
-                    <!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->
-                    <QTr v-if="props.rowIndex !== rows.length - 1" class="separation-row">
-                        <QTd colspan="12" class="vn-table-separation-row" />
-                    </QTr>
                 </template>
                 <template #item="props">
                     <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
@@ -466,11 +458,11 @@ const lockIconType = (groupingMode, mode) => {
 </template>
 
 <style lang="scss" scoped>
-.separation-row {
-    background-color: var(--vn-section-color) !important;
+.q-table--horizontal-separator tbody tr:nth-child(odd) > td {
+    border-bottom-width: 0px;
 }
-.grid-style-transition {
-    transition: transform 0.28s, background-color 0.28s;
+.infoRow > td {
+    color: rgb(122, 122, 122);
 }
 </style>
 

From 80adeede817d14ef710303c36d826c200ba199c3 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 11 Jun 2024 14:28:19 +0200
Subject: [PATCH 2/4] fix: refs #7499 fix item reference

---
 src/i18n/locale/en.yml             |  1 +
 src/i18n/locale/es.yml             |  1 +
 src/pages/Entry/Card/EntryBuys.vue | 24 ++++++++++++++++++++++--
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 85f78a7ee..0d8f82e82 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -394,6 +394,7 @@ entry:
         type: Type
         color: Color
         id: ID
+        printedStickers: Printed stickers
     notes:
         observationType: Observation type
     descriptor:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index ae3f24e51..f43dd10c6 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -392,6 +392,7 @@ entry:
         type: Tipo
         color: Color
         id: ID
+        printedStickers: Etiquetas imprimidas
     notes:
         observationType: Tipo de observación
     descriptor:
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 4d454f509..bf492eed6 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -82,6 +82,16 @@ const tableColumnComponents = computed(() => ({
         },
         event: getInputEvents,
     },
+    printedStickers: {
+        component: VnInput,
+        props: {
+            type: 'number',
+            min: 0,
+            class: 'input-number',
+            dense: true,
+        },
+        event: getInputEvents,
+    },
     weight: {
         component: VnInput,
         props: {
@@ -169,6 +179,12 @@ const entriesTableColumns = computed(() => {
             name: 'stickers',
             align: 'left',
         },
+        {
+            label: t('entry.buys.printedStickers'),
+            field: 'printedStickers',
+            name: 'printedStickers',
+            align: 'left',
+        },
         {
             label: t('entry.summary.weight'),
             field: 'weight',
@@ -390,9 +406,9 @@ const lockIconType = (groupingMode, mode) => {
                             </component>
                         </QTd>
                     </QTr>
-                    <QTr no-hover class="infoRow">
+                    <QTr no-hover class="full-width infoRow" style="column-span: all">
                         <QTd />
-                        <QTd>
+                        <QTd cols>
                             <span>{{ props.row.item.itemType.code }}</span>
                         </QTd>
                         <QTd>
@@ -461,6 +477,10 @@ const lockIconType = (groupingMode, mode) => {
 .q-table--horizontal-separator tbody tr:nth-child(odd) > td {
     border-bottom-width: 0px;
 }
+.q-table--horizontal-separator tbody tr:nth-child(odd) > td {
+    border-top-width: 2px;
+    border-color: rgb(209, 209, 209);
+}
 .infoRow > td {
     color: rgb(122, 122, 122);
 }

From 6789f3d1cb63ea90a7b29a980db313a0d7fe3ec8 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 11 Jun 2024 14:32:01 +0200
Subject: [PATCH 3/4] fix: refs #7499 fix style

---
 src/pages/Entry/Card/EntryBuys.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index bf492eed6..2fd56ba9e 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -476,8 +476,6 @@ const lockIconType = (groupingMode, mode) => {
 <style lang="scss" scoped>
 .q-table--horizontal-separator tbody tr:nth-child(odd) > td {
     border-bottom-width: 0px;
-}
-.q-table--horizontal-separator tbody tr:nth-child(odd) > td {
     border-top-width: 2px;
     border-color: rgb(209, 209, 209);
 }

From a65f5dfe44429e24f024991686328503bbd13d4e Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 11 Jun 2024 16:38:12 +0200
Subject: [PATCH 4/4] fix: refs #7499 use current colors

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

diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index fdb1d88eb..a42775b9a 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -394,7 +394,7 @@ entry:
         type: Tipo
         color: Color
         id: ID
-        printedStickers: Etiquetas imprimidas
+        printedStickers: Etiquetas impresas
     notes:
         observationType: Tipo de observación
     descriptor:
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 2fd56ba9e..b08c40810 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -477,10 +477,10 @@ const lockIconType = (groupingMode, mode) => {
 .q-table--horizontal-separator tbody tr:nth-child(odd) > td {
     border-bottom-width: 0px;
     border-top-width: 2px;
-    border-color: rgb(209, 209, 209);
+    border-color: var(--vn-text-color);
 }
 .infoRow > td {
-    color: rgb(122, 122, 122);
+    color: var(--vn-label-color);
 }
 </style>