From c4375b2505efee560cd0c710dc130368118a7422 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 14 Nov 2024 15:29:18 +0100
Subject: [PATCH] feat: refs #7641 fine tunning

---
 print/templates/reports/entry-order/entry-order.html | 7 ++++++-
 print/templates/reports/entry-order/sql/buys.sql     | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/print/templates/reports/entry-order/entry-order.html b/print/templates/reports/entry-order/entry-order.html
index cbdfa631f..a4e153fa9 100644
--- a/print/templates/reports/entry-order/entry-order.html
+++ b/print/templates/reports/entry-order/entry-order.html
@@ -67,9 +67,14 @@
                             <div>
                                 <div class="nowrap">Color<strong>→ Lavanda</strong></div>
                                 <div class="nowrap">Altura<strong>→ 100cm</strong></div>
+                                <div class="nowrap" v-if="buy.value5">{{buy.tag5}}<strong>→ {{buy.value5}}</strong></div>
+                                <div class="nowrap" v-if="buy.value6">{{buy.tag6}}<strong>→ {{buy.value6}}</strong></div>
                             </div>
                             <div>
-                                <span class="nowrap">label<strong>→ valor</strong></span>
+                                <div class="nowrap">Color<strong>→ Lavanda</strong></div>
+                                <div class="nowrap">Altura<strong>→ 100cm</strong></div>
+                                <div class="nowrap" v-if="buy.value7">{{buy.tag7}}<strong>→ {{buy.value7}}</strong></div>
+                                <div class="nowrap" v-if="buy.value8">{{buy.tag8}}<strong>→ {{buy.value8}}</strong></div>
                             </div>
                         </td>
                         <td width="5%" class="number">{{buy.quantity | number($i18n.locale)}}</td>
diff --git a/print/templates/reports/entry-order/sql/buys.sql b/print/templates/reports/entry-order/sql/buys.sql
index 92c055483..545849908 100644
--- a/print/templates/reports/entry-order/sql/buys.sql
+++ b/print/templates/reports/entry-order/sql/buys.sql
@@ -10,7 +10,9 @@ SELECT b.itemFk,
 		i.tag6,
 		i.value6,
 		i.tag7,
-		i.value7
+		i.value7,
+		i.tag8,
+		i.value8
 	FROM buy b
 		JOIN item i ON i.id = b.itemFk
 		LEFT JOIN item i2 ON i2.id = b.itemOriginalFk